diff --git a/openstack/cc3test/templates/cronjob-object-store.yaml b/openstack/cc3test/templates/cronjob-object-store.yaml
new file mode 100644
index 0000000000..95b31b073b
--- /dev/null
+++ b/openstack/cc3test/templates/cronjob-object-store.yaml
@@ -0,0 +1,48 @@
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: cc3test-blockstorage
+  namespace: {{ .Values.cc3test.namespace }}
+spec:
+  schedule: {{ .Values.schedules.cc3test_object_store | quote }}
+  concurrencyPolicy: Forbid
+  successfulJobsHistoryLimit: 1
+  failedJobsHistoryLimit: 1
+  jobTemplate:
+    spec:
+      backoffLimit: 2
+      template:
+        {{- if and $.Values.global.linkerd_enabled $.Values.global.linkerd_requested }}
+        metadata:
+          annotations:
+            linkerd.io/inject: enabled
+            config.linkerd.io/skip-inbound-ports: "22,443,9125"
+            config.linkerd.io/skip-outbound-ports: "22,443,9125"
+            config.linkerd.io/proxy-admin-shutdown: enabled
+        {{- end }}
+        spec:
+          volumes:
+            - name: cc3test-config
+              configMap:
+                name: cc3test-config
+            - name: cc3test-secrets
+              secret:
+                secretName: cc3test-secrets
+          containers:
+          - name: base
+            image: {{ required ".Values.global.registry variable missing" .Values.global.registry }}/{{ required ".Values.cc3test.image.name variable missing" .Values.cc3test.image.name }}:{{ required ".Values.cc3test.image.tag variable missing" .Values.cc3test.image.tag }}
+            command: ["/linkerd-await"]
+            args: ["--shutdown", "--", "/bin/sh", "-c", "pytest --disable-pytest-warnings --no-header --color=yes --variables config/config.yaml --variables secrets/secrets.yaml -m 'object_storage and canary and base' -r ap tests/object_store; exit 0"]
+            volumeMounts:
+              - name: cc3test-config
+                mountPath: /cc3test/config
+                readOnly: true
+              - name: cc3test-secrets
+                mountPath: /cc3test/secrets
+                readOnly: true
+            {{- if not (and $.Values.global.linkerd_enabled $.Values.global.linkerd_requested) }}
+            env:
+              - name: LINKERD_AWAIT_DISABLED
+                value: "Linkerd was not enabled or not requested"
+            {{- end }}
+          restartPolicy: Never
diff --git a/openstack/cc3test/values.yaml b/openstack/cc3test/values.yaml
index cec796a7dd..4c91bbbf0d 100644
--- a/openstack/cc3test/values.yaml
+++ b/openstack/cc3test/values.yaml
@@ -24,6 +24,7 @@ schedules:
   cc3test_compute_server: '12,42 * * * *'
   cc3test_compute_purger: '*/20 * * * *'
   cc3test_blockstorage: '3,23,43 * * * *'
+  cc3test_object_store: '16,46 * * * *'
   cc3test_blockstorage_volume: '16,46 * * * *'
   cc3test_blockstorage_purger: '*/30 * * * *'
   cc3test_dns: '*/30 * * * *'