diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e2624f30cb9b230b9642fb552aeef853bdf74a64..d3621d00530a02834f381e22c60848633c29b0bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,7 +84,7 @@ build-pex-base image:
       variables:
         # override DEPLOY_ENV
         DEPLOY_ENV: "test"
-    - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/'
+    - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/'
       variables:
         DEPLOY_ENV: "prod"
 
@@ -116,7 +116,7 @@ build cache:
           variables:
             IMAGE_TAG: $CI_COMMIT_TAG
             VERSION: $CI_COMMIT_TAG
-        - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/'
+        - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/'
           variables:
             IMAGE_TAG: $CI_COMMIT_TAG
             VERSION: $CI_COMMIT_TAG
@@ -307,7 +307,7 @@ pex generate yaml:
          variables:
            # override DEPLOY_ENV
            DEPLOY_ENV: "test"
-       - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/'
+       - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/'
          variables:
            DEPLOY_ENV: "prod"
    artifacts:
@@ -330,7 +330,7 @@ pex child pipeline:
          variables:
            # override DEPLOY_ENV
            DEPLOY_ENV: "test"
-       - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/'
+       - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/'
          variables:
            DEPLOY_ENV: "prod"
 
@@ -351,7 +351,7 @@ go generate yaml:
          variables:
            # override DEPLOY_ENV
            DEPLOY_ENV: "test"
-       - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/'
+       - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/'
          variables:
            DEPLOY_ENV: "prod"
    artifacts:
@@ -374,7 +374,7 @@ go child pipeline:
          variables:
            # override DEPLOY_ENV
            DEPLOY_ENV: "test"
-       - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/'
+       - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/'
          variables:
            DEPLOY_ENV: "prod"
 
@@ -400,7 +400,7 @@ deploy:
             DL_HOST: https://dl-dsoc-test.nrao.edu
             # override ENV_HOST
             ENV_HOST: ws-test.nrao.edu
-        - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/'
+        - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/'
           variables:
             IMAGE_TAG: $CI_COMMIT_TAG
             # override DEPLOY_ENV
diff --git a/ci/bin/generate-go-yaml.py b/ci/bin/generate-go-yaml.py
index 970c093774610362dc03d378b24476826abc8ff4..90bd95cd7cfd6b06f0f6a42bf428df765fd22402 100755
--- a/ci/bin/generate-go-yaml.py
+++ b/ci/bin/generate-go-yaml.py
@@ -129,7 +129,7 @@ def main(argv):
         if deploy_env == "test":
             rule = "$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0.9]+-rc[0-9]+/"
         if deploy_env == "prod":
-            rule = "$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/"
+            rule = "$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/"
 
         write_global_rule(rule=rule)
         go_changes = get_list_of_go_modules()
diff --git a/ci/bin/generate-yaml.py b/ci/bin/generate-yaml.py
index 7207229df4a9f9b1e9b02f7c9eeb65a241492b3d..418d9066fb0d8f4202fb80485da2da13b633503a 100755
--- a/ci/bin/generate-yaml.py
+++ b/ci/bin/generate-yaml.py
@@ -124,7 +124,7 @@ def main(argv):
         if deploy_env == "test":
             rule = "$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0.9]+-rc[0-9]+/"
         if deploy_env == "prod":
-            rule = "$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/"
+            rule = "$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/"
 
         write_global_rule(rule=rule)
         pex_changes = get_list_of_pexables()
diff --git a/ci/build.template.yml b/ci/build.template.yml
index 49919673cd371e91f2c88bd2419addc85ad20395..9dc7a6a7d87f92bea4f4379ba6398ce5c63da80e 100644
--- a/ci/build.template.yml
+++ b/ci/build.template.yml
@@ -33,7 +33,7 @@
             VERSION: $CI_COMMIT_TAG
             # override DEPLOY_ENV
             DEPLOY_ENV: "test"
-        - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/'
+        - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/'
           variables:
             IMAGE_TAG: $CI_COMMIT_TAG
             VERSION: $CI_COMMIT_TAG
diff --git a/ci/push.template.yml b/ci/push.template.yml
index 98c844346d84d27c35bc5585aa6fbac57dbdfafd..e43e610fabc4fe4ef2cdd6768b3e7d61513dbbff 100644
--- a/ci/push.template.yml
+++ b/ci/push.template.yml
@@ -12,7 +12,7 @@
         - if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0.9]+-rc[0-9]+/'
           variables:
             IMAGE_TAG: $CI_COMMIT_TAG
-        - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/'
+        - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/'
           variables:
             IMAGE_TAG: $CI_COMMIT_TAG
     dependencies: []
diff --git a/ci/unit-test.template.yml b/ci/unit-test.template.yml
index e7c104d9989e7f19c9ea9eb3ae3b7e1a5562d46e..e67de8c0e9568a0628a7569cd772a6a5dbba8a0c 100644
--- a/ci/unit-test.template.yml
+++ b/ci/unit-test.template.yml
@@ -17,7 +17,7 @@
         - if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0.9]+-rc[0-9]+/'
           variables:
             IMAGE_TAG: $CI_COMMIT_TAG
-        - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/'
+        - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/'
           variables:
             IMAGE_TAG: $CI_COMMIT_TAG
     dependencies: []