diff --git a/templates/image-server/nginx/helmrelease.yaml b/templates/image-server/nginx/helmrelease.yaml
index 6d93af4..f50e1e9 100644
--- a/templates/image-server/nginx/helmrelease.yaml
+++ b/templates/image-server/nginx/helmrelease.yaml
@@ -1,7 +1,7 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: ${TENANT_NAMESPACE}-nginx
+  name: nginx
   namespace: ${TENANT_NAMESPACE}
 spec:
   serviceAccountName: ${TECHNICAL_ACCOUNT}
diff --git a/templates/windowsserver/flavor/small.yaml b/templates/windowsserver/flavor/small.yaml
index 99ff390..91925af 100644
--- a/templates/windowsserver/flavor/small.yaml
+++ b/templates/windowsserver/flavor/small.yaml
@@ -1,7 +1,7 @@
 apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
-  name: windows-server-2022-vm-template
+  name: windows-server-2022-small
   namespace: ${TENANT_NAMESPACE}
   annotations:
     openshift.io/display-name: "Windows Server 2022 VM"