diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 1f6a187d..ff520985 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -67,8 +67,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        mode: [synchronizer, proxy]
-        fips-mode: [enabled, disabled]
+        app: [synchronizer, proxy]
+        fips_mode: [enabled, disabled]
     steps:
       - name: Login to Artifactory
         uses: docker/login-action@v2
@@ -87,9 +87,9 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          file: docker/Dockerfile.${{ matrix.mode }}
+          file: docker/Dockerfile.${{ matrix.app }}
           push: true
-          tags: splitio-docker.jfrog.io/split-${{ matrix.mode }}${{ matrix.fips-mode == "enabled" && "-fips" || ""}}:${{ env.VERSION }}
+          tags: splitio-docker.jfrog.io/split-${{ matrix.app }}${{ matrix.fips_mode == "enabled" && "-fips" || ""}}:${{ env.VERSION }}
           build-args: |
-            FIPS_MODE=${{ matrix.fips-mode }}
+            FIPS_MODE=${{ matrix.fips_mode }}
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 18601303..b50c9730 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       matrix:
         app: [synchronizer, proxy]
-        fips-mode: [enabled, disabled]
+        fips_mode: [enabled, disabled]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -66,25 +66,25 @@ jobs:
           context: .
           file: docker/Dockerfile.${{ matrix.app }}
           push: false
-          tags: splitio-docker.jfrog.io/split-${{ matrix.app }}${{ matrix.fips-mode == "enabled" && "-fips" || "" }}:latest
+          tags: splitio-docker.jfrog.io/split-${{ matrix.app }}${{ matrix.fips_mode == "enabled" && "-fips" || "" }}:latest
           build-args: |
-            FIPS_MODE=${{ matrix.fips-mode }}
+            FIPS_MODE=${{ matrix.fips_mode }}
 
       - name: Scan container using Lacework
         uses: lacework/lw-scanner-action@v1.4.0
         with:
           LW_ACCOUNT_NAME: ${{ secrets.LW_ACCOUNT_NAME }}
           LW_ACCESS_TOKEN: ${{ secrets.LW_ACCESS_TOKEN }}
-          IMAGE_NAME: splitio-docker.jfrog.io/split-${{ matrix.app }}${{ matrix.fips-mode == "enabled" && "-fips" || "" }}
+          IMAGE_NAME: splitio-docker.jfrog.io/split-${{ matrix.app }}${{ matrix.fips_mode == "enabled" && "-fips" || "" }}
           IMAGE_TAG: latest
           SAVE_RESULTS_IN_LACEWORK: true
           SAVE_BUILD_REPORT: true
-          BUILD_REPORT_FILE_NAME: split-${{ matrix.app }}${{ matrix.fips-mode == "enabled" && "-fips" || "" }}.html
+          BUILD_REPORT_FILE_NAME: split-${{ matrix.app }}${{ matrix.fips_mode == "enabled" && "-fips" || "" }}.html
 
       - name: Save vulnerability report
         if: always()
         uses: actions/upload-artifact@v4
         with:
           name: vulnerability_report
-          path: split-${{ matrix.app }}${{ matrix.fips-mode == "enabled" && "-fips" || "" }}.html
+          path: split-${{ matrix.app }}${{ matrix.fips_mode == "enabled" && "-fips" || "" }}.html
           retention-days: 7
diff --git a/.github/workflows/unstable.yml b/.github/workflows/unstable.yml
index 92d31d8d..6701ca0c 100644
--- a/.github/workflows/unstable.yml
+++ b/.github/workflows/unstable.yml
@@ -10,8 +10,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        mode: [synchronizer, proxy]
-        fips-mode: [enabled, disabled]
+        app: [synchronizer, proxy]
+        fips_mode: [enabled, disabled]
     steps:
       - name: Login to Artifactory
         uses: docker/login-action@v2
@@ -30,8 +30,8 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: docker/Dockerfile.${{ matrix.mode }}
+          file: docker/Dockerfile.${{ matrix.app }}
           push: true
-          tags: splitio-docker-dev.jfrog.io/split-${{ matrix.mode }}${{ matrix.fips-mode == "enabled" && "-fips" || "" }}:${{ env.SHORT_SHA }}
+          tags: splitio-docker-dev.jfrog.io/split-${{ matrix.app }}${{ matrix.fips_mode == "enabled" && "-fips" || "" }}:${{ env.SHORT_SHA }}
           build-args: |
-            FIPS_MODE=${{ matrix.fips-mode }}
+            FIPS_MODE=${{ matrix.fips_mode }}