diff --git a/chart/templates/ws-manager-configmap.yaml b/chart/templates/ws-manager-configmap.yaml
index c6118bfa9b43f9..70aa468ddb8928 100644
--- a/chart/templates/ws-manager-configmap.yaml
+++ b/chart/templates/ws-manager-configmap.yaml
@@ -37,26 +37,32 @@ data:
                     "key": "/ws-daemon-tls-certs/tls.key"
                 }
             },
-            "container": {
-                "workspace": {
-                    {{- if .Values.workspaceSizing.memoryRequest }}
-                    "requests": {
-                        "cpu": "1m",
-                        "memory": "{{ .Values.workspaceSizing.memoryRequest }}Mi"
+            "workspaceClass": {
+                "": {
+                    "container": {
+                        {{- if .Values.workspaceSizing.memoryRequest }}
+                        "requests": {
+                            "cpu": "1m",
+                            "memory": "{{ .Values.workspaceSizing.memoryRequest }}Mi"
+                        },
+                        "limits": {
+                            "cpu": "6",
+                            "memory": "{{ .Values.workspaceSizing.memoryLimit }}Mi"
+                        }
+                        {{ else -}}
+                        "requests": {{ toJson .Values.workspaceSizing.requests }},
+                        "limits": {{ toJson .Values.workspaceSizing.limits }}
+                        {{ end -}}
                     },
-                    "limits": {
-                        "cpu": "6",
-                        "memory": "{{ .Values.workspaceSizing.memoryLimit }}Mi"
-                    },
-                    {{ else -}}
-                    {{- if .Values.workspaceSizing.requests }}
-                    "requests": {{ toJson .Values.workspaceSizing.requests }},
-                    {{ end -}}
-                    {{- if .Values.workspaceSizing.limits }}
-                    "limits": {{ toJson .Values.workspaceSizing.limits }},
-                    {{ end -}}
-                    {{ end -}}
-                    "image": "OVERWRITTEN-IN-REQUEST"
+                    "templates": {
+                        {{- if $wscomp.templates }}
+                        {{ if (or $wscomp.templates.prebuild $wscomp.affinity) -}}"prebuildPath": "/workspace-template/prebuild.yaml",{{- end }}
+                        {{ if (or $wscomp.templates.probe $wscomp.affinity) -}}"probePath": "/workspace-template/probe.yaml",{{- end }}
+                        {{ if (or $wscomp.templates.imagebuild $wscomp.affinity) -}}"imagebuildPath": "/workspace-template/imagebuild.yaml",{{- end }}
+                        {{ if (or $wscomp.templates.regular $wscomp.affinity) -}}"regularPath": "/workspace-template/regular.yaml",{{- end }}
+                        {{ end -}}
+                        "defaultPath": "/workspace-template/default.yaml"
+                    }
                 }
             },
             "heartbeatInterval": "30s",
@@ -68,15 +74,6 @@ data:
             "urlTemplate":     "https://{{"{{ .Prefix }}"}}.ws{{- if $.Values.installation.shortname -}}-{{ $.Values.installation.shortname }}{{- end -}}.{{ $.Values.hostname }}",
             "portUrlTemplate": "https://{{"{{ .WorkspacePort }}"}}-{{"{{ .Prefix }}"}}.ws{{- if $.Values.installation.shortname -}}-{{ $.Values.installation.shortname }}{{- end -}}.{{ $.Values.hostname }}",
             "workspaceHostPath": "{{ .Values.components.wsDaemon.hostWorkspaceArea }}",
-            "podTemplate": {
-                {{- if $wscomp.templates }}
-                {{ if (or $wscomp.templates.prebuild $wscomp.affinity) -}}"prebuildPath": "/workspace-template/prebuild.yaml",{{- end }}
-                {{ if (or $wscomp.templates.probe $wscomp.affinity) -}}"probePath": "/workspace-template/probe.yaml",{{- end }}
-                {{ if (or $wscomp.templates.imagebuild $wscomp.affinity) -}}"imagebuildPath": "/workspace-template/imagebuild.yaml",{{- end }}
-                {{ if (or $wscomp.templates.regular $wscomp.affinity) -}}"regularPath": "/workspace-template/regular.yaml",{{- end }}
-                {{ end -}}
-                "defaultPath": "/workspace-template/default.yaml"
-            },
             "timeouts": {
                 "afterClose": "2m",
                 "headlessWorkspace": "60m",