diff --git a/deploy/base/contact-form/contact-form-deployment.yaml b/deploy/base/forms/forms-deployment.yaml
similarity index 100%
rename from deploy/base/contact-form/contact-form-deployment.yaml
rename to deploy/base/forms/forms-deployment.yaml
diff --git a/deploy/base/contact-form/contact-form-service.yaml b/deploy/base/forms/forms-service.yaml
similarity index 100%
rename from deploy/base/contact-form/contact-form-service.yaml
rename to deploy/base/forms/forms-service.yaml
diff --git a/deploy/base/contact-form/kustomization.yaml b/deploy/base/forms/kustomization.yaml
similarity index 100%
rename from deploy/base/contact-form/kustomization.yaml
rename to deploy/base/forms/kustomization.yaml
diff --git a/deploy/demo/contact-form/contact-form-ingress.yaml b/deploy/demo/contact-form/contact-form-ingress.yaml
deleted file mode 100644
index 9288f96c..00000000
--- a/deploy/demo/contact-form/contact-form-ingress.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: forms
-  annotations:
-    nginx.ingress.kubernetes.io/proxy-buffering: 'on'
-    nginx.ingress.kubernetes.io/proxy-buffers-number: '8'
-    nginx.ingress.kubernetes.io/proxy-buffer-size: '32k'
-spec:
-  ingressClassName: nginx
-  rules:
-    - host: new.demo.fellesdatakatalog.digdir.no
-      http:
-        paths:
-          - backend:
-              service:
-                name: forms
-                port:
-                  number: 8080
-            path: /
-            pathType: Prefix
diff --git a/deploy/demo/contact-form/contact-form-env.yaml b/deploy/demo/forms/forms-env.yaml
similarity index 100%
rename from deploy/demo/contact-form/contact-form-env.yaml
rename to deploy/demo/forms/forms-env.yaml
diff --git a/deploy/demo/contact-form/kustomization.yaml b/deploy/demo/forms/kustomization.yaml
similarity index 87%
rename from deploy/demo/contact-form/kustomization.yaml
rename to deploy/demo/forms/kustomization.yaml
index e535c093..8f18683a 100644
--- a/deploy/demo/contact-form/kustomization.yaml
+++ b/deploy/demo/forms/kustomization.yaml
@@ -4,7 +4,6 @@ kind: Kustomization
 namespace: demo
 resources:
   - ../../base/forms
-  - forms-ingress.yaml
 
 patchesStrategicMerge:
   - forms-env.yaml
diff --git a/deploy/prod/contact-form/contact-form-ingress.yaml b/deploy/prod/contact-form/contact-form-ingress.yaml
deleted file mode 100644
index 3ac066a7..00000000
--- a/deploy/prod/contact-form/contact-form-ingress.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: forms
-  annotations:
-    nginx.ingress.kubernetes.io/proxy-buffering: 'on'
-    nginx.ingress.kubernetes.io/proxy-buffers-number: '8'
-    nginx.ingress.kubernetes.io/proxy-buffer-size: '32k'
-spec:
-  ingressClassName: nginx
-  rules:
-    - host: new.fellesdatakatalog.digdir.no
-      http:
-        paths:
-          - backend:
-              service:
-                name: forms
-                port:
-                  number: 8080
-            path: /
-            pathType: Prefix
diff --git a/deploy/prod/contact-form/contact-form-env.yaml b/deploy/prod/forms/forms-env.yaml
similarity index 100%
rename from deploy/prod/contact-form/contact-form-env.yaml
rename to deploy/prod/forms/forms-env.yaml
diff --git a/deploy/prod/contact-form/kustomization.yaml b/deploy/prod/forms/kustomization.yaml
similarity index 87%
rename from deploy/prod/contact-form/kustomization.yaml
rename to deploy/prod/forms/kustomization.yaml
index d22d8e5d..2ac2fc9e 100644
--- a/deploy/prod/contact-form/kustomization.yaml
+++ b/deploy/prod/forms/kustomization.yaml
@@ -4,7 +4,6 @@ kind: Kustomization
 namespace: prod
 resources:
   - ../../base/forms
-  - forms-ingress.yaml
 
 patchesStrategicMerge:
   - forms-env.yaml
diff --git a/deploy/staging/contact-form/contact-form-ingress.yaml b/deploy/staging/contact-form/contact-form-ingress.yaml
deleted file mode 100644
index dc05e89d..00000000
--- a/deploy/staging/contact-form/contact-form-ingress.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: forms
-  annotations:
-    nginx.ingress.kubernetes.io/proxy-buffering: 'on'
-    nginx.ingress.kubernetes.io/proxy-buffers-number: '8'
-    nginx.ingress.kubernetes.io/proxy-buffer-size: '32k'
-spec:
-  ingressClassName: nginx
-  rules:
-    - host: new.staging.fellesdatakatalog.digdir.no
-      http:
-        paths:
-          - backend:
-              service:
-                name: forms
-                port:
-                  number: 8080
-            path: /
-            pathType: Prefix
diff --git a/deploy/staging/contact-form/contact-form-env.yaml b/deploy/staging/forms/forms-env.yaml
similarity index 100%
rename from deploy/staging/contact-form/contact-form-env.yaml
rename to deploy/staging/forms/forms-env.yaml
diff --git a/deploy/staging/contact-form/kustomization.yaml b/deploy/staging/forms/kustomization.yaml
similarity index 87%
rename from deploy/staging/contact-form/kustomization.yaml
rename to deploy/staging/forms/kustomization.yaml
index 7987cbd2..20ead960 100644
--- a/deploy/staging/contact-form/kustomization.yaml
+++ b/deploy/staging/forms/kustomization.yaml
@@ -4,7 +4,6 @@ kind: Kustomization
 namespace: staging
 resources:
   - ../../base/forms
-  - forms-ingress.yaml
 
 patchesStrategicMerge:
   - forms-env.yaml