diff --git a/functions/kubernetes/charts/shuffle/values.yaml b/functions/kubernetes/charts/shuffle/values.yaml
index d0b39608..1e6af05e 100644
--- a/functions/kubernetes/charts/shuffle/values.yaml
+++ b/functions/kubernetes/charts/shuffle/values.yaml
@@ -76,7 +76,7 @@ diagnosticMode:
 shuffle:
   ## @param shuffle.baseUrl The external base URL under which Shuffle is reachable.
   ##
-  baseUrl: ""
+  #baseUrl: ""
 
   ## ref: https://shuffler.io/docs/organizations
   ## This chart only supports single-tenant deployments at the moment
@@ -527,6 +527,8 @@ backend:
     ## @param backend.openSearch.username The username that is used for authenticating with OpenSearch
     ##
     username: admin
+
+    password: StrongShufflePassword321!
     ## @param backend.openSearch.certificateFile The path to a custom OpenSearch certificate file
     ##
     certificateFile: ""
@@ -1204,14 +1206,12 @@ orborus:
       value: "300"
     - name: SHUFFLE_ORBORUS_EXCUTION_CONCURRENCY
       value: "7"
-    - name: ENVIRONMENT_NAME
-      value: "Shuffle"
-    - name: BASE_URL
-      value: "http://shuffle-backend:5001"
     - name: SHUFFLE_STATS_DISABLED
       value: "true"
-    - name: CLEANUP
-      value: "false"
+    - name: KUBERNETES_NAMESPACE
+      value: "shuffle"
+    - name: SHUFFLE_BASE_IMAGE_NAME
+      value: "frikky/shuffle"
   ## @param orborus.extraEnvVarsCM Name of existing ConfigMap containing extra env vars for orborus containers
   ##
   extraEnvVarsCM: ""
@@ -1855,8 +1855,8 @@ volumePermissions:
   ## @param volumePermissions.image.pullSecrets OS Shell + Utility image pull secrets
   ##
   image:
-    registry: public.ecr.aws
-    repository: bitnami/os-shell
+    registry: docker.io
+    repository: bitnamilegacy/os-shell
     tag: 12-debian-12-r30
     pullPolicy: IfNotPresent
     ## Optionally specify an array of imagePullSecrets.
@@ -1917,20 +1917,14 @@ opensearch:
     enabled: false
 
   image:
-    registry: public.ecr.aws
-    repository: bitnami/opensearch
+    registry: docker.io
+    repository: bitnamilegacy/opensearch
     tag: "3.2.0"
 
   master:
     replicaCount: 1
-    extraEnvVars:
-      - { name: OPENSEARCH_JAVA_OPTS, value: "-Xms1g -Xmx1g" }
-      - { name: DISABLE_PERFORMANCE_ANALYZER_AGENT_CLI, value: "true" }
-      - { name: node.store.allow_mmap, value: "false" }
-      - { name: cluster.routing.allocation.disk.threshold_enabled, value: "false" }
-
   data:
-    replicaCount: 0
+    replicaCount: 1
   coordinating:
     replicaCount: 0
   ingest:
diff --git a/functions/onprem/orborus/orborus.go b/functions/onprem/orborus/orborus.go
index ab9b2230..2fd9cd0f 100755
--- a/functions/onprem/orborus/orborus.go
+++ b/functions/onprem/orborus/orborus.go
@@ -1586,7 +1586,7 @@ func initializeImages() {
 		if len(os.Getenv("REGISTRY_URL")) > 0 {
 			baseimageregistry = os.Getenv("REGISTRY_URL")
 		} else {
-			os.Setenv("REGISTRY_URL", baseimageregistry)
+			// os.Setenv("REGISTRY_URL", baseimageregistry)
 		}
 
 		os.Setenv("SHUFFLE_BASE_IMAGE_REGISTRY", baseimageregistry)
diff --git a/functions/onprem/worker/worker.go b/functions/onprem/worker/worker.go
index 6dd41de4..10c1fc8c 100644
--- a/functions/onprem/worker/worker.go
+++ b/functions/onprem/worker/worker.go
@@ -3893,7 +3893,7 @@ func sendAppRequest(ctx context.Context, incomingUrl, appName string, port int,
 		if attempts < 2 {
 			// Check the service and fix it. 
 			if isKubernetes == "true" {
-				log.Printf("[WARNING] App Redeployment in K8s isn't fully supported yet, but should be done for app %s with image %s.", appName, image) 
+				log.Printf("[WARNING] App Redeployment in K8s isn't fully supported yet, but should be done for app %s with image %s.", appName, image)
 			} else {
 				_, err = findAppInfo(image, appName, true)
 				if err != nil {