diff --git a/kubernetes/overlays/prod/overlays/askem-dev/services/beaker/beaker-deployment.yaml b/kubernetes/overlays/prod/overlays/askem-dev/services/beaker/beaker-deployment.yaml
index 8a538322..c886b8ef 100644
--- a/kubernetes/overlays/prod/overlays/askem-dev/services/beaker/beaker-deployment.yaml
+++ b/kubernetes/overlays/prod/overlays/askem-dev/services/beaker/beaker-deployment.yaml
@@ -6,6 +6,22 @@ metadata:
 spec:
   template:
     spec:
+      containers:
+        - name: beaker
+          env:
+            - name: APP_URL
+              value: https://beaker.dev.terarium.ai
+            - name: JUPYTER_BASE_URL
+              value: https://beaker.dev.terarium.ai
+            - name: JUPYTER_WS_URL
+              value: wss://beaker.dev.terarium.ai
+          resources:
+            requests:
+              memory: '1Gi'
+              cpu: '2000m'
+            limits:
+              memory: '28Gi'
+              cpu: '7000m'
       tolerations:
         - key: 'workload'
           operator: 'Equal'
diff --git a/kubernetes/overlays/prod/overlays/askem-production/ingress/private-web-ingress.yaml b/kubernetes/overlays/prod/overlays/askem-production/ingress/private-web-ingress.yaml
index a151f058..d707426e 100644
--- a/kubernetes/overlays/prod/overlays/askem-production/ingress/private-web-ingress.yaml
+++ b/kubernetes/overlays/prod/overlays/askem-production/ingress/private-web-ingress.yaml
@@ -29,7 +29,25 @@ spec:
                 name: hmi-server
                 port:
                   number: 3000
+    - host: 'beaker.terarium.ai'
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: ssl-redirect
+                port:
+                  name: use-annotation
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: beaker
+                port:
+                  number: 3050
 
   tls:
     - hosts:
         - 'server.terarium.ai'
+        - 'beaker.terarium.ai'
diff --git a/kubernetes/overlays/prod/overlays/askem-production/ingress/private-web-non-ssl-ingress.yaml b/kubernetes/overlays/prod/overlays/askem-production/ingress/private-web-non-ssl-ingress.yaml
deleted file mode 100644
index bcd80153..00000000
--- a/kubernetes/overlays/prod/overlays/askem-production/ingress/private-web-non-ssl-ingress.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: private-web-non-ssl-ingress
-  annotations:
-    alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS":443}]'
-    alb.ingress.kubernetes.io/scheme: internet-facing
-    alb.ingress.kubernetes.io/security-groups: askem-prod-web-private, askem-prod-k8s
-    alb.ingress.kubernetes.io/target-type: instance
-spec:
-  ingressClassName: alb
-  rules:
-    - host: 'beaker.terarium.ai'
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: beaker
-                port:
-                  number: 3050
-  tls:
-    - hosts:
-        - 'beaker.terarium.ai'
diff --git a/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml b/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml
index bab5e5d8..2160f6f6 100644
--- a/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml
+++ b/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml
@@ -5,7 +5,6 @@ namespace: terarium
 resources:
   - ../../base
   - ingress/private-web-ingress.yaml
-  - ingress/private-web-non-ssl-ingress.yaml
   - ingress/public-web-ingress.yaml
   - ingress/public-web-ssl-ingress.yaml
   - secrets/secrets-adobe-api-key.yaml
diff --git a/kubernetes/overlays/prod/overlays/askem-production/services/beaker/beaker-deployment.yaml b/kubernetes/overlays/prod/overlays/askem-production/services/beaker/beaker-deployment.yaml
index 78fd6b71..61631cbe 100644
--- a/kubernetes/overlays/prod/overlays/askem-production/services/beaker/beaker-deployment.yaml
+++ b/kubernetes/overlays/prod/overlays/askem-production/services/beaker/beaker-deployment.yaml
@@ -9,6 +9,13 @@ spec:
       nodeName: ip-172-16-40-52.ec2.internal
       containers:
         - name: beaker
+          env:
+            - name: APP_URL
+              value: https://beaker.terarium.ai
+            - name: JUPYTER_BASE_URL
+              value: https://beaker.terarium.ai
+            - name: JUPYTER_WS_URL
+              value: wss://beaker.terarium.ai
           resources:
             requests:
               memory: '1Gi'
diff --git a/kubernetes/overlays/prod/overlays/askem-staging/ingress/private-web-ingress.yaml b/kubernetes/overlays/prod/overlays/askem-staging/ingress/private-web-ingress.yaml
index 5322cc34..0d2d0276 100644
--- a/kubernetes/overlays/prod/overlays/askem-staging/ingress/private-web-ingress.yaml
+++ b/kubernetes/overlays/prod/overlays/askem-staging/ingress/private-web-ingress.yaml
@@ -192,8 +192,27 @@ spec:
                 port:
                   number: 8000
 
+    - host: 'beaker.staging.terarium.ai'
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: ssl-redirect
+                port:
+                  name: use-annotation
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: beaker
+                port:
+                  number: 3050
+
   tls:
     - hosts:
+        - 'beaker.staging.terarium.ai'
         - 'climate-data.staging.terarium.ai'
         - 'funman.staging.terarium.ai'
         - 'graphdb.staging.terarium.ai'
diff --git a/kubernetes/overlays/prod/overlays/askem-staging/ingress/private-web-non-ssl-ingress.yaml b/kubernetes/overlays/prod/overlays/askem-staging/ingress/private-web-non-ssl-ingress.yaml
deleted file mode 100644
index 39e9cdf2..00000000
--- a/kubernetes/overlays/prod/overlays/askem-staging/ingress/private-web-non-ssl-ingress.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: private-web-non-ssl-ingress
-  annotations:
-    alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS":443}]'
-    alb.ingress.kubernetes.io/scheme: internet-facing
-    alb.ingress.kubernetes.io/security-groups: askem-staging-web-private, askem-staging-k8s
-    alb.ingress.kubernetes.io/target-type: instance
-spec:
-  ingressClassName: alb
-  rules:
-    - host: 'beaker.staging.terarium.ai'
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: beaker
-                port:
-                  number: 3050
-  tls:
-    - hosts:
-        - 'beaker.staging.terarium.ai'
diff --git a/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml b/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml
index e1b0f776..3d23a12c 100644
--- a/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml
+++ b/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml
@@ -7,7 +7,6 @@ resources:
   - check-latest
   - ingress/private-web-grpc-ingress.yaml
   - ingress/private-web-ingress.yaml
-  - ingress/private-web-non-ssl-ingress.yaml
   - ingress/public-web-ingress.yaml
   - ingress/public-web-ssl-ingress.yaml
   - secrets/secrets-adobe-api-key.yaml
diff --git a/kubernetes/overlays/prod/overlays/askem-staging/services/beaker/beaker-deployment.yaml b/kubernetes/overlays/prod/overlays/askem-staging/services/beaker/beaker-deployment.yaml
index 8a538322..4c1e82a9 100644
--- a/kubernetes/overlays/prod/overlays/askem-staging/services/beaker/beaker-deployment.yaml
+++ b/kubernetes/overlays/prod/overlays/askem-staging/services/beaker/beaker-deployment.yaml
@@ -6,6 +6,22 @@ metadata:
 spec:
   template:
     spec:
+      containers:
+        - name: beaker
+          env:
+            - name: APP_URL
+              value: https://beaker.staging.terarium.ai
+            - name: JUPYTER_BASE_URL
+              value: https://beaker.staging.terarium.ai
+            - name: JUPYTER_WS_URL
+              value: wss://beaker.staging.terarium.ai
+          resources:
+            requests:
+              memory: '1Gi'
+              cpu: '2000m'
+            limits:
+              memory: '28Gi'
+              cpu: '7000m'
       tolerations:
         - key: 'workload'
           operator: 'Equal'