diff --git a/src/k8s/production.yml b/src/main/k8s/production.yml
similarity index 88%
rename from src/k8s/production.yml
rename to src/main/k8s/production.yml
index c26d30d3912dc5735581ca7abbc72bf00f86d13f..bd00737e99305d4de65df8a74cbfb2a49c7ef44c 100644
--- a/src/k8s/production.yml
+++ b/src/main/k8s/production.yml
@@ -2,11 +2,12 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: marketplace-rest-api
-  namespace: webapps
+  namespace: foundation-internal-webdev-apps
 spec:
   selector:
     matchLabels:
       app: marketplace-rest-api
+      environment: production
   replicas: 2
   template:
     metadata:
@@ -32,7 +33,7 @@ apiVersion: "v1"
 kind: "Service"
 metadata:
   name: marketplace-rest-api
-  namespace: webapps
+  namespace: foundation-internal-webdev-apps
 spec:
   ports:
   - name: "http"
@@ -47,7 +48,7 @@ apiVersion: "route.openshift.io/v1"
 kind: "Route"
 metadata:
   name: marketplace-rest-api
-  namespace: webapps
+  namespace: foundation-internal-webdev-apps
   annotations:
     haproxy.router.openshift.io/timeout: 20s
 spec:
diff --git a/src/k8s/staging.yml b/src/main/k8s/staging.yml
similarity index 77%
rename from src/k8s/staging.yml
rename to src/main/k8s/staging.yml
index a67d1a4b9656158791aef0abd7d2b6fc1645df9a..9dc86a31b715d21bb220cc51d3b1cb8d7a363a05 100644
--- a/src/k8s/staging.yml
+++ b/src/main/k8s/staging.yml
@@ -1,12 +1,13 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: marketplace-rest-api
-  namespace: webapps
+  name: staging-marketplace-rest-api
+  namespace: foundation-internal-webdev-apps
 spec:
   selector:
     matchLabels:
       app: marketplace-rest-api
+      environment: staging
   replicas: 2
   template:
     metadata:
@@ -31,8 +32,8 @@ spec:
 apiVersion: "v1"
 kind: "Service"
 metadata:
-  name: marketplace-rest-api
-  namespace: webapps
+  name: staging-marketplace-rest-api
+  namespace: foundation-internal-webdev-apps
 spec:
   ports:
   - name: "http"
@@ -46,8 +47,8 @@ spec:
 apiVersion: "route.openshift.io/v1"
 kind: "Route"
 metadata:
-  name: marketplace-rest-api
-  namespace: webapps
+  name: staging-marketplace-rest-api
+  namespace: foundation-internal-webdev-apps
   annotations:
     haproxy.router.openshift.io/timeout: 20s
 spec:
@@ -60,5 +61,5 @@ spec:
     termination: "edge"
   to:
     kind: "Service"
-    name: marketplace-rest-api
+    name: staging-marketplace-rest-api
     weight: 100
\ No newline at end of file