diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db97701c8e..5204613d70 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -467,7 +467,30 @@ agent-bundle-windows:
         splunk_orca --cloud aws show deployments
       fi
       popd
-
+.SPLUNK_LINUX_AWS_FIPS: &SPLUNK_LINUX_AWS_FIPS
+        UF_VERSION: ["10.0.0"]
+        SPLUNK_PLATFORM: ["x64_amazon_linux_2_fips"]
+        ORCA_CLOUD: ["aws"]
+        ORCA_OPTION: ['--env SPLUNK_LAUNCH_CONF="SPLUNK_FIPS=1"']
+        PLATFORM: ["linux"]
+.SPLUNK_LINUX: &SPLUNK_LINUX
+        UF_VERSION: ["9.0.2", "8.2.7"]
+        SPLUNK_PLATFORM: ["x64_centos_7"]
+        ORCA_CLOUD: ["aws"]
+        ORCA_OPTION: ['--env SPLUNK_LAUNCH_CONF="SPLUNK_FIPS=0"']
+        PLATFORM: ["linux"]
+.SPLUNK_WINDOWS_AWS_FIPS: &SPLUNK_WINDOWS_AWS_FIPS
+        UF_VERSION: ["10.0.0"]
+        SPLUNK_PLATFORM: ["x64_windows_2022_fips"]
+        ORCA_CLOUD: ["aws"]
+        ORCA_OPTION: ['--env SPLUNK_LAUNCH_CONF="SPLUNK_FIPS=1"']
+        PLATFORM: ["windows"]
+.SPLUNK_WINDOWS: &SPLUNK_WINDOWS
+        UF_VERSION: ["9.0.2", "8.2.7"]
+        SPLUNK_PLATFORM: ["x64_windows_2019","x64_windows_2022"]
+        ORCA_CLOUD: ["aws"]
+        ORCA_OPTION: ['--env SPLUNK_LAUNCH_CONF="SPLUNK_FIPS=0"']
+        PLATFORM: ["windows"]
 package-technical-addon:
   image: "${DOCKER_CICD_REPO}/ci-container/python-3.11-bullseye:1.19.0"
   stage: "package"
@@ -476,8 +499,6 @@ package-technical-addon:
   artifacts:
     paths:
       - "$BUILD_DIR/out/distribution/Splunk_TA_otel*.tgz"
-      - "$BUILD_DIR/packaging-scripts"
-      - "$BUILD_DIR/Makefile"
   parallel:
     matrix:
       - PLATFORM: ["all"]
@@ -490,16 +511,10 @@ test-happypath-ta:
     - "package-technical-addon"
   parallel:
     matrix:
-      - UF_VERSION: ["9.0.2", "8.2.7"]
-        SPLUNK_PLATFORM: ["x64_centos_7"]
-        ORCA_CLOUD: ["aws"]
-        ORCA_OPTION: [""]
-        PLATFORM: ["linux"]
-      - UF_VERSION: ["9.0.2", "8.2.7"]
-        SPLUNK_PLATFORM: ["x64_windows_2019","x64_windows_2022" ]
-        ORCA_CLOUD: ["aws"]
-        ORCA_OPTION: [""]
-        PLATFORM: ["windows"]
+      - *SPLUNK_LINUX
+      - *SPLUNK_LINUX_AWS_FIPS
+      - *SPLUNK_WINDOWS
+      - *SPLUNK_WINDOWS_AWS_FIPS
   script: |
     make orca-test-ta -e
   after_script:
@@ -512,7 +527,7 @@ test-happypath-ta:
     paths:
       - "$BUILD_DIR/out/**/*"
       - "$BUILD_DIR/$CI_JOB_ID/**/*"
-test-collectd-ta:
+.test-collectd-ta:
   image: "${DOCKER_CICD_REPO}/ci-container/python-3.11-bullseye:1.19.0"
   extends: .auth-setup
   stage: orca-tests
@@ -539,7 +554,7 @@ test-collectd-ta:
     paths:
       - "$BUILD_DIR/out/**/*"
       - "$BUILD_DIR/$CI_JOB_ID/**/*"
-test-gateway-ta:
+.test-gateway-ta:
   image: "${DOCKER_CICD_REPO}/ci-container/python-3.11-bullseye:1.19.0"
   extends: .auth-setup
   stage: orca-tests
@@ -547,16 +562,8 @@ test-gateway-ta:
     - "package-technical-addon"
   parallel:
     matrix:
-      - UF_VERSION: ["9.0.2", "8.2.7"]
-        SPLUNK_PLATFORM: ["x64_centos_7"]
-        ORCA_CLOUD: ["aws"]
-        ORCA_OPTION: [""]
-        PLATFORM: ["linux"]
-      - UF_VERSION: ["9.0.2", "8.2.7"]
-        SPLUNK_PLATFORM: ["x64_windows_2019", "x64_windows_2022"]
-        ORCA_CLOUD: ["aws"]
-        ORCA_OPTION: [""]
-        PLATFORM: ["windows"]
+      - *SPLUNK_LINUX
+      - *SPLUNK_WINDOWS
   script: |
     make orca-gateway-test-ta -e
   after_script:
@@ -571,7 +578,7 @@ test-gateway-ta:
     paths:
       - "$BUILD_DIR/out/**/*"
       - "$BUILD_DIR/$CI_JOB_ID/**/*"
-AppInspect_local:
+.AppInspect_local:
   image: "${DOCKER_CICD_REPO}/ci-container/python-3.11-bullseye:1.19.0"
   dependencies:
     - "package-technical-addon"
diff --git a/packaging/technical-addon/packaging-scripts/cicd-tests/happypath-test.sh b/packaging/technical-addon/packaging-scripts/cicd-tests/happypath-test.sh
index 7ffb1dba03..61353e8fb0 100755
--- a/packaging/technical-addon/packaging-scripts/cicd-tests/happypath-test.sh
+++ b/packaging/technical-addon/packaging-scripts/cicd-tests/happypath-test.sh
@@ -10,7 +10,9 @@ TEST_FOLDER="${TEST_FOLDER:-$BUILD_DIR/$CI_JOB_ID}"
 mkdir -p "$TEST_FOLDER"
 
 # Create ORCA container & grab id
-splunk_orca -vvv --cloud "${ORCA_CLOUD}" --printer sdd-json --deployment-file "$TEST_FOLDER/orca_deployment.json" --ansible-log "$TEST_FOLDER/ansible-local.log" create --prefix "happypath" --env SPLUNK_CONNECTION_TIMEOUT=600 --platform "$SPLUNK_PLATFORM" --splunk-version "${UF_VERSION}" --local-apps "$TA_FULLPATH" --playbook "$SOURCE_DIR/packaging-scripts/orca-playbook-$PLATFORM.yml,site.yml"
+SPLUNK_VERSION="$(echo "$SPLUNK_PLATFORM" | grep -qi "fips" && echo "--splunk-build 04cf955cd1c2ee2d7665da7409fc52fe86bacc5b" || echo "--splunk-version ${UF_VERSION}")"
+# --platform x64_redhat_8_fips --splunk-image Splunk Orca Red Hat 9 FIPS (xxx) --splunk-branch develop
+splunk_orca -vvv --cloud "${ORCA_CLOUD}" --printer sdd-json --deployment-file "$TEST_FOLDER/orca_deployment.json" --ansible-log "$TEST_FOLDER/ansible-local.log" create --prefix "happypath" --env SPLUNK_CONNECTION_TIMEOUT=600 --platform "$SPLUNK_PLATFORM" --local-apps "$TA_FULLPATH" --playbook "$SOURCE_DIR/packaging-scripts/orca-playbook-$PLATFORM.yml,site.yml" ${SPLUNK_VERSION} ${ORCA_OPTION}
 deployment_id="$(jq -r '.orca_deployment_id' < "$TEST_FOLDER/orca_deployment.json")"
 ip_addr="$(jq -r '.server_roles.standalone[0].host' < "$TEST_FOLDER/orca_deployment.json")"