diff --git a/baker/ansible/tasks/product/check.yaml b/baker/ansible/tasks/product/check.yaml
index 29d5fd23..4e51b07f 100644
--- a/baker/ansible/tasks/product/check.yaml
+++ b/baker/ansible/tasks/product/check.yaml
@@ -23,7 +23,7 @@
   ansible.builtin.command:
     cmd: >-
       mvn clean test
-        --activate-profiles {{ devenv }},{{ focus }}
+        --activate-profiles {{ focus }},{{ devenv }}
         --no-snapshot-updates
         --batch-mode
         --also-make
diff --git a/stack/product/focus/resilience/compose.yaml.jinja b/stack/product/focus/resilience/compose.yaml.jinja
index 5d0de5aa..47f5604a 100644
--- a/stack/product/focus/resilience/compose.yaml.jinja
+++ b/stack/product/focus/resilience/compose.yaml.jinja
@@ -69,11 +69,16 @@ services:
         target: /postgres/data
         type: volume
     entrypoint: []
-    command: >-
-      pg_basebackup --write-recovery-conf
-        --host {{ ops.storage.vendor }}-primary
-        --username {{ storage.dba.username }}
-        --pgdata /postgres/data
+    command: |
+      bash <<EOF
+        if [ -z "$(ls -A /postgres/data)" ]; then
+          exit 0
+        fi
+        pg_basebackup --write-recovery-conf
+          --host {{ ops.storage.vendor }}-primary
+          --username {{ storage.dba.username }}
+          --pgdata /postgres/data
+      EOF
     labels:
       image.key: db/{{ ops.storage.vendor }}/{{ devenv }}