diff --git a/roles/openshift-apps/toddlers/templates/cron_playtime.yml b/roles/openshift-apps/toddlers/templates/cron_playtime.yml
index aeadbea7a9..858bb912ed 100644
--- a/roles/openshift-apps/toddlers/templates/cron_playtime.yml
+++ b/roles/openshift-apps/toddlers/templates/cron_playtime.yml
@@ -370,108 +370,109 @@ spec:
               secretName: toddlers-fedora-messaging-crt
 
 {% else %}
----
-apiVersion: batch/v1
-kind: CronJob
-metadata:
-  name: playtime-check-commit-rights
-spec:
-  successfulJobsHistoryLimit: 3
-  failedJobsHistoryLimit: 3
-  concurrencyPolicy: Forbid
-  schedule: "0 8 */2 * *"
-  startingDeadlineSeconds: 500
-  jobTemplate:
-    spec:
-      template:
-        metadata:
-          labels:
-            parent: "cron_playtime_toddlers"
-        spec:
-          restartPolicy: Never
-          containers:
-          - name: toddlers
-            image: image-registry.openshift-image-registry.svc:5000/toddlers/toddlers:latest
-            command: ["/usr/bin/python3", "/code/toddlers/playtime.py", "check-commit-rights"]
-            env:
-              - name: PYTHONPATH
-                value: "/code"
-            volumeMounts:
-             - name: toddlers-secret-volume
-               mountPath: /etc/fedora-messaging
-               readOnly: true
-             - name: fedora-messaging-ca-volume
-               mountPath: /etc/pki/rabbitmq/ca
-               readOnly: true
-             - name: fedora-messaging-key-volume
-               mountPath: /etc/pki/rabbitmq/key
-               readOnly: true
-             - name: fedora-messaging-cert-volume
-               mountPath: /etc/pki/rabbitmq/cert
-               readOnly: true
-          volumes:
-          - name: toddlers-secret-volume
-            secret:
-              secretName: toddlers-secret
-          - name: fedora-messaging-ca-volume
-            secret:
-              secretName: toddlers-fedora-messaging-ca
-          - name: fedora-messaging-key-volume
-            secret:
-             secretName: toddlers-fedora-messaging-key
-          - name: fedora-messaging-cert-volume
-            secret:
-              secretName: toddlers-fedora-messaging-crt
----
-apiVersion: batch/v1
-kind: CronJob
-metadata:
-  name: playtime-clean-retired-packages
-spec:
-  successfulJobsHistoryLimit: 3
-  failedJobsHistoryLimit: 3
-  concurrencyPolicy: Forbid
-  schedule: "0 8 1 * *"
-  startingDeadlineSeconds: 500
-  jobTemplate:
-    spec:
-      template:
-        metadata:
-          labels:
-            parent: "cron_playtime_toddlers"
-        spec:
-          restartPolicy: Never
-          containers:
-          - name: toddlers
-            image: image-registry.openshift-image-registry.svc:5000/toddlers/toddlers:latest
-            command: ["/usr/bin/python3", "/code/toddlers/playtime.py", "clean_retired_packages"]
-            env:
-              - name: PYTHONPATH
-                value: "/code"
-            volumeMounts:
-             - name: toddlers-secret-volume
-               mountPath: /etc/fedora-messaging
-               readOnly: true
-             - name: fedora-messaging-ca-volume
-               mountPath: /etc/pki/rabbitmq/ca
-               readOnly: true
-             - name: fedora-messaging-key-volume
-               mountPath: /etc/pki/rabbitmq/key
-               readOnly: true
-             - name: fedora-messaging-cert-volume
-               mountPath: /etc/pki/rabbitmq/cert
-               readOnly: true
-          volumes:
-          - name: toddlers-secret-volume
-            secret:
-              secretName: toddlers-secret
-          - name: fedora-messaging-ca-volume
-            secret:
-              secretName: toddlers-fedora-messaging-ca
-          - name: fedora-messaging-key-volume
-            secret:
-             secretName: toddlers-fedora-messaging-key
-          - name: fedora-messaging-cert-volume
-            secret:
-              secretName: toddlers-fedora-messaging-crt
+## Replaced by Poddlers ##
+# ---
+# apiVersion: batch/v1
+# kind: CronJob
+# metadata:
+#   name: playtime-check-commit-rights
+# spec:
+#   successfulJobsHistoryLimit: 3
+#   failedJobsHistoryLimit: 3
+#   concurrencyPolicy: Forbid
+#   schedule: "0 8 */2 * *"
+#   startingDeadlineSeconds: 500
+#   jobTemplate:
+#     spec:
+#       template:
+#         metadata:
+#           labels:
+#             parent: "cron_playtime_toddlers"
+#         spec:
+#           restartPolicy: Never
+#           containers:
+#           - name: toddlers
+#             image: image-registry.openshift-image-registry.svc:5000/toddlers/toddlers:latest
+#             command: ["/usr/bin/python3", "/code/toddlers/playtime.py", "check-commit-rights"]
+#             env:
+#               - name: PYTHONPATH
+#                 value: "/code"
+#             volumeMounts:
+#              - name: toddlers-secret-volume
+#                mountPath: /etc/fedora-messaging
+#                readOnly: true
+#              - name: fedora-messaging-ca-volume
+#                mountPath: /etc/pki/rabbitmq/ca
+#                readOnly: true
+#              - name: fedora-messaging-key-volume
+#                mountPath: /etc/pki/rabbitmq/key
+#                readOnly: true
+#              - name: fedora-messaging-cert-volume
+#                mountPath: /etc/pki/rabbitmq/cert
+#                readOnly: true
+#           volumes:
+#           - name: toddlers-secret-volume
+#             secret:
+#               secretName: toddlers-secret
+#           - name: fedora-messaging-ca-volume
+#             secret:
+#               secretName: toddlers-fedora-messaging-ca
+#           - name: fedora-messaging-key-volume
+#             secret:
+#              secretName: toddlers-fedora-messaging-key
+#           - name: fedora-messaging-cert-volume
+#             secret:
+#               secretName: toddlers-fedora-messaging-crt
+# ---
+# apiVersion: batch/v1
+# kind: CronJob
+# metadata:
+#   name: playtime-clean-retired-packages
+# spec:
+#   successfulJobsHistoryLimit: 3
+#   failedJobsHistoryLimit: 3
+#   concurrencyPolicy: Forbid
+#   schedule: "0 8 1 * *"
+#   startingDeadlineSeconds: 500
+#   jobTemplate:
+#     spec:
+#       template:
+#         metadata:
+#           labels:
+#             parent: "cron_playtime_toddlers"
+#         spec:
+#           restartPolicy: Never
+#           containers:
+#           - name: toddlers
+#             image: image-registry.openshift-image-registry.svc:5000/toddlers/toddlers:latest
+#             command: ["/usr/bin/python3", "/code/toddlers/playtime.py", "clean_retired_packages"]
+#             env:
+#               - name: PYTHONPATH
+#                 value: "/code"
+#             volumeMounts:
+#              - name: toddlers-secret-volume
+#                mountPath: /etc/fedora-messaging
+#                readOnly: true
+#              - name: fedora-messaging-ca-volume
+#                mountPath: /etc/pki/rabbitmq/ca
+#                readOnly: true
+#              - name: fedora-messaging-key-volume
+#                mountPath: /etc/pki/rabbitmq/key
+#                readOnly: true
+#              - name: fedora-messaging-cert-volume
+#                mountPath: /etc/pki/rabbitmq/cert
+#                readOnly: true
+#           volumes:
+#           - name: toddlers-secret-volume
+#             secret:
+#               secretName: toddlers-secret
+#           - name: fedora-messaging-ca-volume
+#             secret:
+#               secretName: toddlers-fedora-messaging-ca
+#           - name: fedora-messaging-key-volume
+#             secret:
+#              secretName: toddlers-fedora-messaging-key
+#           - name: fedora-messaging-cert-volume
+#             secret:
+#               secretName: toddlers-fedora-messaging-crt
 {% endif %}
diff --git a/roles/openshift-apps/toddlers/templates/deploymentconfig.yml b/roles/openshift-apps/toddlers/templates/deploymentconfig.yml
index 58140ba23e..e684964725 100644
--- a/roles/openshift-apps/toddlers/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/toddlers/templates/deploymentconfig.yml
@@ -7,7 +7,12 @@ metadata:
     service: toddlers
   name: toddlers
 spec:
+{% if env != 'staging' %}
   replicas: 3
+{% else %}
+  ## Replaced by Poddlers ##
+  replicas: 0
+{% endif %}
   selector:
     app: toddlers
     deploymentconfig: toddlers