diff --git a/inventory/group_vars/os_masters b/inventory/group_vars/os_masters
index d74d7f6543..3920863845 100644
--- a/inventory/group_vars/os_masters
+++ b/inventory/group_vars/os_masters
@@ -12,5 +12,5 @@ nagios_Check_Services:
 # Set some bodhi variables here.
 # Since they are used when running playbooks against the master nodes.
 #
-bodhi_version: 5.4.0-1.fc32.infra
+bodhi_version: 5.4.1
 bodhi_openshift_pods: 2
diff --git a/inventory/group_vars/os_masters_stg b/inventory/group_vars/os_masters_stg
index dacad7e65d..ca07dfb445 100644
--- a/inventory/group_vars/os_masters_stg
+++ b/inventory/group_vars/os_masters_stg
@@ -11,5 +11,5 @@ nagios_Check_Services:
 # Set some bodhi variables here.
 # Since they are used when running playbooks against the master nodes.
 #
-bodhi_version: 5.3.0-1.fc32.infra
+bodhi_version: staging
 bodhi_openshift_pods: 1
diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml
index f160411bb7..0dddc9d95b 100644
--- a/playbooks/openshift-apps/bodhi.yml
+++ b/playbooks/openshift-apps/bodhi.yml
@@ -95,12 +95,6 @@
     app: bodhi
     template: buildconfig.yml
     objectname: buildconfig.yml
-    when: env == "production"
-  - role: openshift/object
-    app: bodhi
-    template: buildconfig-stg.yml
-    objectname: buildconfig.yml
-    when: env == "staging"
   - role: openshift/start-build
     app: bodhi
     buildname: bodhi-base
diff --git a/roles/openshift-apps/bodhi/templates/buildconfig-stg.yml b/roles/openshift-apps/bodhi/templates/buildconfig-stg.yml
deleted file mode 100644
index 7436a79983..0000000000
--- a/roles/openshift-apps/bodhi/templates/buildconfig-stg.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-{% macro load_file(filename) %}{% include filename %}{%- endmacro -%}
-apiVersion: v1
-items:
-- apiVersion: v1
-  kind: BuildConfig
-  metadata:
-    labels:
-      build: bodhi-base
-    name: bodhi-base
-  spec:
-    runPolicy: Serial
-    source:
-      dockerfile: |-
-        {{ load_file('dockerfile-base') | indent(8) }}
-      type: Dockerfile
-    strategy:
-      type: Docker
-      dockerStrategy:
-        noCache: false
-    output:
-      to:
-        kind: ImageStreamTag
-        name: bodhi-base:latest
-kind: List
-metadata: {}
diff --git a/roles/openshift-apps/bodhi/templates/buildconfig.yml b/roles/openshift-apps/bodhi/templates/buildconfig.yml
index 4e6f144d34..7436a79983 100644
--- a/roles/openshift-apps/bodhi/templates/buildconfig.yml
+++ b/roles/openshift-apps/bodhi/templates/buildconfig.yml
@@ -1,3 +1,4 @@
+{% macro load_file(filename) %}{% include filename %}{%- endmacro -%}
 apiVersion: v1
 items:
 - apiVersion: v1
@@ -10,21 +11,7 @@ items:
     runPolicy: Serial
     source:
       dockerfile: |-
-        FROM fedora:32
-        LABEL \
-          name="bodhi-base" \
-          vendor="Fedora Infrastructure" \
-          license="MIT"
-        RUN curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/fedora-infra-tags.repo
-        # While dnf has a --nodocs, it doesen't have a --docs...
-        RUN sed -i '/nodocs/d' /etc/dnf/dnf.conf
-        RUN dnf install -y bodhi-server-{{bodhi_version}} bodhi-docs-{{bodhi_version}} python3-pyramid_sawing python3-gunicorn
-
-        # Set up krb5
-        RUN rm -f /etc/krb5.conf && \
-            ln -sf /etc/bodhi/krb5.conf /etc/krb5.conf && \
-            ln -sf /etc/keytabs/koji-keytab /etc/krb5.bodhi_bodhi{{ env_suffix }}.fedoraproject.org.keytab
-        ENV USER=openshift
+        {{ load_file('dockerfile-base') | indent(8) }}
       type: Dockerfile
     strategy:
       type: Docker
diff --git a/roles/openshift-apps/bodhi/templates/dockerfile-base b/roles/openshift-apps/bodhi/templates/dockerfile-base
index 300cdaa830..688b75ccd6 100644
--- a/roles/openshift-apps/bodhi/templates/dockerfile-base
+++ b/roles/openshift-apps/bodhi/templates/dockerfile-base
@@ -3,8 +3,6 @@ LABEL \
   name="bodhi-base" \
   vendor="Fedora Infrastructure" \
   license="MIT"
-# While dnf has a --nodocs, it doesen't have a --docs...
-RUN sed -i '/nodocs/d' /etc/dnf/dnf.conf
 
 RUN dnf install -y \
     git                         \
@@ -48,7 +46,7 @@ RUN dnf install -y \
     koji && \
     dnf clean all
 
-RUN git clone -b staging https://github.com/fedora-infra/bodhi.git /srv/bodhi && \
+RUN git clone -b {{bodhi_version}} https://github.com/fedora-infra/bodhi.git /srv/bodhi && \
     cd /srv/bodhi && \
     python3 -m pip install . --no-use-pep517 && \
     mkdir -p /usr/share/bodhi && \