diff --git a/.github/workflows/cd-deploy-nodes-gcp.yml b/.github/workflows/cd-deploy-nodes-gcp.yml
index aa7955997bc..0b167ceb63c 100644
--- a/.github/workflows/cd-deploy-nodes-gcp.yml
+++ b/.github/workflows/cd-deploy-nodes-gcp.yml
@@ -137,7 +137,7 @@ jobs:
       test_id: 'testnet-conf'
       docker_image: ${{ vars.GAR_BASE }}/zebrad@${{ needs.build.outputs.image_digest }}
       grep_patterns: '-e "net.*=.*Test.*estimated progress to chain tip.*Genesis" -e "net.*=.*Test.*estimated progress to chain tip.*BeforeOverwinter"'
-      test_variables: '-e NETWORK -e ZEBRA_CONF_PATH="/etc/zebrad/zebrad.toml"'
+      test_variables: '-e NETWORK'
       network: 'Testnet'
 
   # Test that Zebra works using $ZEBRA_CONF_PATH config
diff --git a/docker/Dockerfile b/docker/Dockerfile
index e18b9923a94..f27ff99fa71 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -190,8 +190,8 @@ ARG FEATURES
 ENV FEATURES=${FEATURES}
 
 # Path and name of the config file
-ENV ZEBRA_CONF_DIR=/etc/zebrad
-ENV ZEBRA_CONF_FILE=zebrad.toml
+ENV ZEBRA_CONF_DIR=${ZEBRA_CONF_DIR:-/etc/zebrad}
+ENV ZEBRA_CONF_FILE=${ZEBRA_CONF_FILE:-zebrad.toml}
 
 # Expose configured ports
 EXPOSE 8233 18233