diff --git a/src/internal/embedded/resources/Makefile-common b/src/internal/embedded/resources/Makefile-common
index 79bcf80..36cae53 100644
--- a/src/internal/embedded/resources/Makefile-common
+++ b/src/internal/embedded/resources/Makefile-common
@@ -52,3 +52,7 @@ validate-schema: ## validates values files against schema in common/clustergroup
 .PHONY: argo-healthcheck
 argo-healthcheck: ## Checks if all argo applications are synced
 	@$(ANSIBLE_RUN) rhvp.cluster_utils.argo_healthcheck
+
+.PHONY: run-ci-tests
+run-ci-tests: ## To run ci-tests, set any needed env vars
+	@$(ANSIBLE_RUN) rhvp.cluster_utils.run_ci_tests
diff --git a/src/internal/embedded/resources/pattern.sh b/src/internal/embedded/resources/pattern.sh
index 85c9905..b2172fd 100755
--- a/src/internal/embedded/resources/pattern.sh
+++ b/src/internal/embedded/resources/pattern.sh
@@ -9,6 +9,19 @@ function version {
     echo "$1" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'
 }
 
+# We need this check mostly for CI testing, we do not want to run container in container
+function is_container() {
+    [ -n "${KUBERNETES_SERVICE_HOST:-}" ] && return 0
+    [ -f /.dockerenv ] && return 0
+    [ -f /run/.containerenv ] && return 0
+    return 1
+}
+
+if is_container; then
+    echo "Already running in a container"
+    exec "$@"
+fi
+
 if [ -z "${PATTERN_UTILITY_CONTAINER:-}" ]; then
 	PATTERN_UTILITY_CONTAINER="quay.io/validatedpatterns/utility-container"
 fi
@@ -115,6 +128,7 @@ podman run -it --rm --pull=newer \
     -e TOKEN_SECRET \
     -e UUID_FILE \
     -e VALUES_SECRET \
+    -e 'VP_*' \
     "${PKI_HOST_MOUNT_ARGS[@]}" \
     -v "$(pwd -P)":"$(pwd -P)" \
     -v "${HOME}":"${HOME}" \