diff --git a/functions/k8s-confs/[stage-1 b/functions/k8s-confs/[stage-1
deleted file mode 100644
index e69de29b..00000000
diff --git a/functions/k8s-confs/backend-deployment.yaml b/functions/k8s-confs/backend-deployment.yaml
deleted file mode 100644
index c6f1dbfc..00000000
--- a/functions/k8s-confs/backend-deployment.yaml
+++ /dev/null
@@ -1,434 +0,0 @@
----
-
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: shuffle-apps-pv
-spec:
-  capacity:
-    storage: 10Gi
-  accessModes:
-    - ReadWriteOnce
-  persistentVolumeReclaimPolicy: Retain
-  storageClassName: fast
-  local:
-    path: /mnt/shuffle-data/backend
-  nodeAffinity:
-    required:
-      nodeSelectorTerms:
-        - matchExpressions:
-            - key: node
-              operator: In
-              values:
-                - master
-
-# ---
-
-# apiVersion: v1
-# kind: PersistentVolume
-# metadata:
-#   name: shuffle-files-pv
-# spec:
-#   capacity:
-#     storage: 5Gi  
-#   accessModes:
-#     - ReadWriteOnce  
-#   persistentVolumeReclaimPolicy: Retain  
-#   storageClassName: fast
-#   hostPath:
-#     path: /mnt/shuffle-data/backend
-
-# ---
-
-# apiVersion: v1
-# kind: PersistentVolumeClaim
-# metadata:
-#   creationTimestamp: null
-#   labels:
-#     io.kompose.service: backend-files-claim
-#   name: backend-files-claim
-# spec:
-#   accessModes:
-#     - ReadWriteOnce
-#   storageClassName: fast
-#   resources:
-#     requests:
-#       storage: 1Gi
-# status: {}
-
----
-
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  creationTimestamp: null
-  labels:
-    io.kompose.service: backend-apps-claim
-  name: backend-apps-claim
-spec:
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: fast
-  resources:
-    requests:
-      storage: 1Gi
-# status: {}
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations:
-    kompose.cmd: kompose convert -f docker-compose.yml
-    kompose.version: 1.26.0 (40646f47)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: backend
-  name: backend
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      io.kompose.service: backend
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      annotations:
-        kompose.cmd: kompose convert -f docker-compose.yml
-        kompose.version: 1.26.0 (40646f47)
-      creationTimestamp: null
-      labels:
-        io.kompose.network/shuffle: "true"
-        io.kompose.service: backend
-        app: shuffle-backend
-      name: shuffle-backend
-    spec:
-      volumes:
-        # - name: shuffle-files
-        #   persistentVolumeClaim:
-        #     claimName: backend-files-claim
-        # - name: shuffle-apps
-        #   hostPath:
-        #     path: /mnt/shuffle-data/backend
-        #     type: DirectoryOrCreate
-        - name: shuffle-apps
-          persistentVolumeClaim:
-            claimName: backend-apps-claim
-        # - name: docker-socket
-        #   hostPath:
-        #     path: /var/run/docker.sock
-      nodeSelector:
-        node: master
-      containers:
-        - env:
-            - name: BACKEND_HOSTNAME
-              valueFrom:
-                configMapKeyRef:
-                  key: BACKEND_HOSTNAME
-                  name: env
-            - name: BACKEND_PORT
-              valueFrom:
-                configMapKeyRef:
-                  key: BACKEND_PORT
-                  name: env
-            - name: BASE_URL
-              valueFrom:
-                configMapKeyRef:
-                  key: BASE_URL
-                  name: env
-            - name: DATASTORE_EMULATOR_HOST
-              valueFrom:
-                configMapKeyRef:
-                  key: DATASTORE_EMULATOR_HOST
-                  name: env
-            - name: DB_LOCATION
-              valueFrom:
-                configMapKeyRef:
-                  key: DB_LOCATION
-                  name: env
-            - name: DOCKER_API_VERSION
-              valueFrom:
-                configMapKeyRef:
-                  key: DOCKER_API_VERSION
-                  name: env
-            - name: ENVIRONMENT_NAME
-              valueFrom:
-                configMapKeyRef:
-                  key: ENVIRONMENT_NAME
-                  name: env
-            - name: FRONTEND_PORT
-              valueFrom:
-                configMapKeyRef:
-                  key: FRONTEND_PORT
-                  name: env
-            - name: FRONTEND_PORT_HTTPS
-              valueFrom:
-                configMapKeyRef:
-                  key: FRONTEND_PORT_HTTPS
-                  name: env
-            - name: HTTPS_PROXY
-              valueFrom:
-                configMapKeyRef:
-                  key: HTTPS_PROXY
-                  name: env
-            - name: HTTP_PROXY
-              valueFrom:
-                configMapKeyRef:
-                  key: HTTP_PROXY
-                  name: env
-            - name: ORBORUS_CONTAINER_NAME
-              valueFrom:
-                configMapKeyRef:
-                  key: ORBORUS_CONTAINER_NAME
-                  name: env
-            - name: ORG_ID
-              valueFrom:
-                configMapKeyRef:
-                  key: ORG_ID
-                  name: env
-            - name: OUTER_HOSTNAME
-              valueFrom:
-                configMapKeyRef:
-                  key: OUTER_HOSTNAME
-                  name: env
-            - name: SHUFFLE_APP_DOWNLOAD_LOCATION
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_APP_DOWNLOAD_LOCATION
-                  name: env
-            - name: SHUFFLE_APP_FORCE_UPDATE
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_APP_FORCE_UPDATE
-                  name: env
-            - name: SHUFFLE_APP_HOTLOAD_FOLDER
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_APP_HOTLOAD_FOLDER
-                  name: env
-            - name: SHUFFLE_APP_HOTLOAD_LOCATION
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_APP_HOTLOAD_LOCATION
-                  name: env
-            - name: SHUFFLE_BASE_IMAGE_NAME
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_BASE_IMAGE_NAME
-                  name: env
-            - name: SHUFFLE_BASE_IMAGE_REGISTRY
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_BASE_IMAGE_REGISTRY
-                  name: env
-            - name: SHUFFLE_BASE_IMAGE_TAG_SUFFIX
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_BASE_IMAGE_TAG_SUFFIX
-                  name: env
-            - name: SHUFFLE_CHAT_DISABLED
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_CHAT_DISABLED
-                  name: env
-            - name: SHUFFLE_CONTAINER_AUTO_CLEANUP
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_CONTAINER_AUTO_CLEANUP
-                  name: env
-            - name: SHUFFLE_DEFAULT_APIKEY
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_DEFAULT_APIKEY
-                  name: env
-            - name: SHUFFLE_DEFAULT_PASSWORD
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_DEFAULT_PASSWORD
-                  name: env
-            - name: SHUFFLE_DEFAULT_USERNAME
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_DEFAULT_USERNAME
-                  name: env
-            - name: SHUFFLE_DOWNLOAD_AUTH_BRANCH
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_DOWNLOAD_AUTH_BRANCH
-                  name: env
-            - name: SHUFFLE_DOWNLOAD_AUTH_PASSWORD
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_DOWNLOAD_AUTH_PASSWORD
-                  name: env
-            - name: SHUFFLE_DOWNLOAD_AUTH_USERNAME
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_DOWNLOAD_AUTH_USERNAME
-                  name: env
-            - name: SHUFFLE_DOWNLOAD_WORKFLOW_BRANCH
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_DOWNLOAD_WORKFLOW_BRANCH
-                  name: env
-            - name: SHUFFLE_DOWNLOAD_WORKFLOW_LOCATION
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_DOWNLOAD_WORKFLOW_LOCATION
-                  name: env
-            - name: SHUFFLE_DOWNLOAD_WORKFLOW_PASSWORD
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_DOWNLOAD_WORKFLOW_PASSWORD
-                  name: env
-            - name: SHUFFLE_DOWNLOAD_WORKFLOW_USERNAME
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_DOWNLOAD_WORKFLOW_USERNAME
-                  name: env
-            - name: SHUFFLE_ELASTIC
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_ELASTIC
-                  name: env
-            - name: SHUFFLE_ENCRYPTION_MODIFIER
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_ENCRYPTION_MODIFIER
-                  name: env
-            - name: SHUFFLE_FILE_LOCATION
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_FILE_LOCATION
-                  name: env
-            - name: SHUFFLE_LOGS_DISABLED
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_LOGS_DISABLED
-                  name: env
-            - name: SHUFFLE_OPENSEARCH_APIKEY
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_OPENSEARCH_APIKEY
-                  name: env
-            - name: SHUFFLE_OPENSEARCH_CERTIFICATE_FILE
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_OPENSEARCH_CERTIFICATE_FILE
-                  name: env
-            - name: SHUFFLE_OPENSEARCH_CLOUDID
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_OPENSEARCH_CLOUDID
-                  name: env
-            - name: SHUFFLE_OPENSEARCH_INDEX_PREFIX
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_OPENSEARCH_INDEX_PREFIX
-                  name: env
-            - name: SHUFFLE_OPENSEARCH_PASSWORD
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_OPENSEARCH_PASSWORD
-                  name: env
-            - name: SHUFFLE_OPENSEARCH_PROXY
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_OPENSEARCH_PROXY
-                  name: env
-            - name: SHUFFLE_OPENSEARCH_SKIPSSL_VERIFY
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_OPENSEARCH_SKIPSSL_VERIFY
-                  name: env
-            - name: SHUFFLE_OPENSEARCH_URL
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_OPENSEARCH_URL
-                  name: env
-            - name: SHUFFLE_OPENSEARCH_USERNAME
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_OPENSEARCH_USERNAME
-                  name: env
-            - name: SHUFFLE_ORBORUS_STARTUP_DELAY
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_ORBORUS_STARTUP_DELAY
-                  name: env
-            - name: SHUFFLE_PASS_APP_PROXY
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_PASS_APP_PROXY
-                  name: env
-            - name: SHUFFLE_PASS_WORKER_PROXY
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_PASS_WORKER_PROXY
-                  name: env
-            - name: SHUFFLE_RERUN_SCHEDULE
-              valueFrom:
-                configMapKeyRef:
-                  key: SHUFFLE_RERUN_SCHEDULE
-                  name: env
-            - name: SSO_REDIRECT_URL
-              valueFrom:
-                configMapKeyRef:
-                  key: SSO_REDIRECT_URL
-                  name: env
-            - name: TZ
-              valueFrom:
-                configMapKeyRef:
-                  key: TZ
-                  name: env
-            - name: IS_KUBERNETES
-              valueFrom:
-                configMapKeyRef:
-                  key: IS_KUBERNETES
-                  name: env
-            - name: REGISTRY_URL
-              valueFrom:
-                configMapKeyRef:
-                  key: REGISTRY_URL
-                  name: env
-          image: shuffle-backend:v1
-          imagePullPolicy: Never
-          name: shuffle-backend
-          ports:
-            - containerPort: 5001
-          resources: {}
-          volumeMounts:
-            # - name: docker-socket 
-            #   mountPath: /var/run/docker.sock
-            - name: shuffle-apps
-              mountPath: /app/generated
-            # - name: shuffle-files 
-            #   mountPath: /shuffle-files
-      restartPolicy: Always
-status: {}
-
----
-
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    kompose.cmd: kompose convert -f docker-compose.yml
-    kompose.version: 1.26.0 (40646f47)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: backend
-  name: shuffle-backend
-spec:
-  type: NodePort
-  ports:
-    - name: "50001"
-      port: 5001
-      targetPort: 5001
-      nodePort: 30009
-  selector:
-    io.kompose.service: backend
-status:
-  loadBalancer: {}
-
diff --git a/functions/k8s-confs/env-configmap.yaml b/functions/k8s-confs/env-configmap.yaml
deleted file mode 100644
index ad02ad97..00000000
--- a/functions/k8s-confs/env-configmap.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-apiVersion: v1
-data:
-  BACKEND_HOSTNAME: shuffle-backend
-  BACKEND_PORT: "5001"
-  BASE_URL: http://shuffle-backend:5001
-  DATASTORE_EMULATOR_HOST: shuffle-database:8000
-  DB_LOCATION: /mnt/shuffle-data/open-search
-  DOCKER_API_VERSION: "1.40"
-  ENVIRONMENT_NAME: Shuffle
-  FRONTEND_PORT: "3001"
-  FRONTEND_PORT_HTTPS: "3443"
-  HTTP_PROXY: ""
-  HTTPS_PROXY: ""
-  ORBORUS_CONTAINER_NAME: "\t\t\t\t"
-  ORG_ID: Shuffle
-  OUTER_HOSTNAME: shuffle-backend
-  SHUFFLE_APP_DOWNLOAD_LOCATION: https://github.com/shuffle/python-apps
-  SHUFFLE_APP_FORCE_UPDATE: "false"
-  SHUFFLE_APP_HOTLOAD_FOLDER: /shuffle-apps
-  SHUFFLE_APP_HOTLOAD_LOCATION: ./shuffle-apps
-  SHUFFLE_BASE_IMAGE_NAME: shuffle
-  SHUFFLE_BASE_IMAGE_REGISTRY: ghcr.io
-  SHUFFLE_BASE_IMAGE_TAG_SUFFIX: -1.0.0
-  SHUFFLE_CHAT_DISABLED: "false"
-  SHUFFLE_CONTAINER_AUTO_CLEANUP: "false"
-  SHUFFLE_DEFAULT_APIKEY: ""
-  SHUFFLE_DEFAULT_PASSWORD: ""
-  SHUFFLE_DEFAULT_USERNAME: ""
-  SHUFFLE_DOWNLOAD_AUTH_BRANCH: ""
-  SHUFFLE_DOWNLOAD_AUTH_PASSWORD: ""
-  SHUFFLE_DOWNLOAD_AUTH_USERNAME: ""
-  SHUFFLE_DOWNLOAD_WORKFLOW_BRANCH: ""
-  SHUFFLE_DOWNLOAD_WORKFLOW_LOCATION: ""
-  SHUFFLE_DOWNLOAD_WORKFLOW_PASSWORD: ""
-  SHUFFLE_DOWNLOAD_WORKFLOW_USERNAME: ""
-  SHUFFLE_ELASTIC: "true"
-  SHUFFLE_ENCRYPTION_MODIFIER: ""
-  SHUFFLE_FILE_LOCATION: /shuffle-files
-  SHUFFLE_LOGS_DISABLED: "false"
-  SHUFFLE_OPENSEARCH_APIKEY: ""
-  SHUFFLE_OPENSEARCH_CERTIFICATE_FILE: ""
-  SHUFFLE_OPENSEARCH_CLOUDID: ""
-  SHUFFLE_OPENSEARCH_INDEX_PREFIX: ""
-  SHUFFLE_OPENSEARCH_PASSWORD: admin
-  SHUFFLE_OPENSEARCH_PROXY: ""
-  SHUFFLE_OPENSEARCH_SKIPSSL_VERIFY: "true"
-  SHUFFLE_OPENSEARCH_URL: https://opensearch:9200
-  SHUFFLE_OPENSEARCH_USERNAME: admin
-  SHUFFLE_ORBORUS_STARTUP_DELAY: "\t\t"
-  SHUFFLE_PASS_APP_PROXY: "FALSE"
-  SHUFFLE_PASS_WORKER_PROXY: "TRUE"
-  SHUFFLE_RERUN_SCHEDULE: "300"
-  SSO_REDIRECT_URL: ""
-  TZ: "Europe/Amsterdam \t\t\t\t\t"
-  IS_KUBERNETES: "true"
-  REGISTRY_URL: "172.17.14.71:5000"
-  #REGISTRY_AUTH: ""
-kind: ConfigMap
-metadata:
-  creationTimestamp: null
-  labels:
-    io.kompose.service: backend-env
-  name: env
diff --git a/functions/k8s-confs/frontend-deployment.yaml b/functions/k8s-confs/frontend-deployment.yaml
deleted file mode 100644
index cb11f728..00000000
--- a/functions/k8s-confs/frontend-deployment.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations:
-    kompose.cmd: kompose convert -f docker-compose.yml
-    kompose.version: 1.26.0 (40646f47)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: frontend
-  name: frontend
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      io.kompose.service: frontend
-  strategy: {}
-  template:
-    metadata:
-      annotations:
-        kompose.cmd: kompose convert -f docker-compose.yml
-        kompose.version: 1.26.0 (40646f47)
-      creationTimestamp: null
-      labels:
-        io.kompose.network/shuffle: "true"
-        io.kompose.service: frontend
-    spec:
-      containers:
-        - env:
-            - name: BACKEND_HOSTNAME
-          image: ghcr.io/shuffle/shuffle-frontend:latest
-          name: shuffle-frontend
-          ports:
-            - containerPort: 80
-            - containerPort: 443
-          resources: {}
-      hostname: shuffle-frontend
-      restartPolicy: Always
-status: {}
-
----
-
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    kompose.cmd: kompose convert -f docker-compose.yml
-    kompose.version: 1.26.0 (40646f47)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: frontend
-  name: frontend
-spec:
-  type: NodePort
-  ports:
-    - name: "80"
-      port: 80
-      targetPort: 80
-      nodePort: 30007
-    - name: "443"
-      port: 443
-      targetPort: 443
-      nodePort: 30008
-  selector:
-    io.kompose.service: frontend
-# status:
-#   loadBalancer: {}
diff --git a/functions/k8s-confs/kaniko.yaml b/functions/k8s-confs/kaniko.yaml
deleted file mode 100644
index bbeb261e..00000000
--- a/functions/k8s-confs/kaniko.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: kaniko-build
-spec:
-  template:
-    spec:
-      nodeSelector:
-        node: master
-      containers:
-      - name: kaniko
-        image: gcr.io/kaniko-project/executor:debug
-        # command: ["/busybox/sh", "-c"]
-        # args: ["-c","while true; do sleep 3600; done"]    
-        args:  [
-            "--verbosity=debug",
-            "--context=dir:///app/generated/ok-349ec164d4ad2409152dcb901257f718",
-            "--dockerfile=./Dockerfile",
-            #"--no-push",
-            "--skip-tls-verify",
-            # "--registry-certificate=172.17.14.71:5000=/workspace/certs/cert.pem",
-            "--destination=172.17.14.71:5000/shuffle/dhaval-kaniko:1.0"
-              ] 
-        volumeMounts:
-        - name: kaniko-workspace
-          mountPath: /app/generated
-      nodeSelector:
-        node: master
-      restartPolicy: Never
-      volumes:
-      - name: kaniko-workspace
-        persistentVolumeClaim:
-            claimName: backend-apps-claim
diff --git a/functions/k8s-confs/opensearch-deployment.yaml b/functions/k8s-confs/opensearch-deployment.yaml
deleted file mode 100644
index 4d0e996a..00000000
--- a/functions/k8s-confs/opensearch-deployment.yaml
+++ /dev/null
@@ -1,129 +0,0 @@
----
-
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: shuffle-os-pv
-spec:
-  capacity:
-    storage: 10Gi  # Adjust the storage size as per your requirements
-  accessModes:
-    - ReadWriteOnce  # This allows read-write access to a single node
-  persistentVolumeReclaimPolicy: Retain  # Adjust the reclaim policy as per your needs
-  storageClassName: fast  # Set the desired storage class
-  hostPath:
-    path: /mnt/shuffle-data/open-search
-
----
-
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  creationTimestamp: null
-  labels:
-    io.kompose.service: opensearch-claim0
-  name: opensearch-claim0
-spec:
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: fast
-  resources:
-    requests:
-      storage: 500Mi
-status: {}
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations:
-    kompose.cmd: kompose convert -f docker-compose.yml
-    kompose.version: 1.26.0 (40646f47)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: opensearch
-  name: opensearch
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      io.kompose.service: opensearch
-  strategy: {}
-  template:
-    metadata:
-      annotations:
-        kompose.cmd: kompose convert -f docker-compose.yml
-        kompose.version: 1.26.0 (40646f47)
-      creationTimestamp: null
-      labels:
-        io.kompose.network/shuffle: "true"
-        io.kompose.service: opensearch
-    spec:
-     # securityContext:
-     #   runAsUser: 1000  # UID
-     #   fsGroup: 1000    # GID
-      nodeSelector:
-        node: worker1
-      containers:
-        - env:
-            - name: OPENSEARCH_JAVA_OPTS
-              value: -Xms1024m -Xmx1024m
-              #- name: bootstrap.memory_lock
-              #value: "true"
-            - name: cluster.initial_master_nodes
-              value: shuffle-opensearch
-            - name: cluster.name
-              value: shuffle-cluster
-            - name: cluster.routing.allocation.disk.threshold_enabled
-              value: "false"
-            - name: discovery.seed_hosts
-              value: shuffle-opensearch
-            - name: node.name
-              value: shuffle-opensearch
-            - name: node.store.allow_mmap
-              value: "false"
-            - name: DB_LOCATION
-              valueFrom: 
-                configMapKeyRef:
-                  name: env
-                  key: DB_LOCATION
-          image: opensearchproject/opensearch:2.5.0
-          name: shuffle-opensearch
-          ports:
-            - containerPort: 9200
-          resources: {}
-          volumeMounts:
-            - mountPath: /usr/share/opensearch/data
-              name: opensearch-claim0
-      hostname: shuffle-opensearch
-      restartPolicy: Always
-      volumes:
-        - name: opensearch-claim0
-          persistentVolumeClaim:
-            claimName: opensearch-claim0
-status: {}
-
----
-
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    kompose.cmd: kompose convert -f docker-compose.yml
-    kompose.version: 1.26.0 (40646f47)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: opensearch
-  name: opensearch
-spec:
-  type: NodePort
-  ports:
-    - name: "9200"
-      port: 9200
-      targetPort: 9200
-      nodePort: 31001
-  selector:
-    io.kompose.service: opensearch
-status:
-  loadBalancer: {}
-
diff --git a/functions/k8s-confs/orborus-deployment.yaml b/functions/k8s-confs/orborus-deployment.yaml
deleted file mode 100644
index 05ebfe08..00000000
--- a/functions/k8s-confs/orborus-deployment.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations:
-    kompose.cmd: kompose convert -f docker-compose.yml
-    kompose.version: 1.26.0 (40646f47)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: orborus
-  name: orborus
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      io.kompose.service: orborus
-  strategy: {}
-  template:
-    metadata:
-      annotations:
-        kompose.cmd: kompose convert -f docker-compose.yml
-        kompose.version: 1.26.0 (40646f47)
-      creationTimestamp: null
-      labels:
-        io.kompose.network/shuffle: "true"
-        io.kompose.service: orborus
-    spec:
-      containers:
-        - env:
-            - name: BASE_URL
-              value: "http://shuffle-backend:5001"
-            - name: DOCKER_API_VERSION
-              value: "1.40"
-            - name: ENVIRONMENT_NAME
-              value: Shuffle
-            - name: ORG_ID
-              value: Shuffle
-            - name: SHUFFLE_APP_SDK_VERSION
-              value: nightly
-            - name: SHUFFLE_SCALE_REPLICAS
-              value: "5"
-              #- name: SHUFFLE_SWARM_CONFIG
-              #value: run
-            - name: SHUFFLE_WORKER_VERSION
-              value: nightly
-            - name: IS_KUBERNETES
-              valueFrom:
-                configMapKeyRef:
-                  key: IS_KUBERNETES
-                  name: env
-            - name: REGISTRY_URL
-              valueFrom:
-                configMapKeyRef:
-                  key: REGISTRY_URL
-                  name: env
-
-          image: shuffle-orborus:v1
-          imagePullPolicy: Never
-          name: shuffle-orborus
-          resources: {}
-      hostname: shuffle-orborus
-      restartPolicy: Always
-status: {}
diff --git a/functions/k8s-confs/registry-deployment.yaml b/functions/k8s-confs/registry-deployment.yaml
deleted file mode 100644
index c7d3044d..00000000
--- a/functions/k8s-confs/registry-deployment.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: registry-pv
-spec:
-  capacity:
-    storage: 10Gi
-  accessModes:
-    - ReadWriteMany
-  persistentVolumeReclaimPolicy: Retain
-  storageClassName: local-storage
-  hostPath:
-    path: "/mnt/shuffle-data/registry"
-
----
-
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: registry-pvc
-spec:
-  accessModes:
-    - ReadWriteMany
-  resources:
-    requests:
-      storage: 10Gi
-  storageClassName: local-storage
-
----
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: shuffle-registry
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: registry
-  template:
-    metadata:
-      labels:
-        app: registry
-    spec:
-      containers:
-        - name: registry
-          image: registry:2
-          ports:
-            - containerPort: 5000
-          volumeMounts:
-            - name: registry-data
-              mountPath: /var/lib/registry
-      volumes:
-        - name: registry-data
-          persistentVolumeClaim:
-            claimName: registry-pvc
----
-
-# registry-service.yaml
-apiVersion: v1
-kind: Service
-metadata:
-  name: shuffle-registry
-spec:
-  selector:
-    app: registry
-  #type: NodePort
-  ports:
-    - protocol: TCP
-      port: 5000
-      targetPort: 5000
-
-  
\ No newline at end of file
diff --git a/functions/k8s-confs/shuffle-registry.yaml b/functions/k8s-confs/shuffle-registry.yaml
deleted file mode 100644
index c6a80858..00000000
--- a/functions/k8s-confs/shuffle-registry.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: shuffle-registry
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: shuffle-registry
-  template:
-    metadata:
-      labels:
-        app: shuffle-registry
-    spec:
-      initContainers:
-      - name: generate-certs
-        image: frapsoft/openssl
-        command: ["openssl"]
-        args:
-        - req
-        - -newkey
-        - rsa:4096
-        - -nodes
-        - -sha256
-        - -x509
-        - -days
-        - "365"
-        - -keyout
-        - /certs/domain.key
-        - -out
-        - /certs/domain.crt
-        - -subj
-        - "/CN=shuffle-registry.default.svc.cluster.local"
-        volumeMounts:
-        - name: certs
-          mountPath: /certs
-      containers:
-      - name: registry
-        image: registry:2
-        ports:
-        - containerPort: 5000
-        env:
-        - name: REGISTRY_HTTP_TLS_CERTIFICATE
-          value: "/certs/domain.crt"
-        - name: REGISTRY_HTTP_TLS_KEY
-          value: "/certs/domain.key"
-        volumeMounts:
-        - name: certs
-          mountPath: "/certs"
-      volumes:
-      - name: certs
-        emptyDir: {}
-
----
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: shuffle-registry
-spec:
-  selector:
-    app: shuffle-registry
-  ports:
-    - protocol: TCP
-      port: 5000
-      targetPort: 5000
diff --git a/functions/k8s-confs/shuffle-role.yaml b/functions/k8s-confs/shuffle-role.yaml
deleted file mode 100644
index bf2afbe9..00000000
--- a/functions/k8s-confs/shuffle-role.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  namespace: shuffle
-  name: pod-manager
-rules:
-- apiGroups: [""]
-  resources: ["pods"]
-  verbs: ["get", "list", "create", "update", "delete"]
-- apiGroups: ["batch"]
-  resources: ["jobs"]
-  verbs: ["create", "get", "list", "watch", "delete"]
diff --git a/functions/k8s-confs/shuffle-rolebinding.yaml b/functions/k8s-confs/shuffle-rolebinding.yaml
deleted file mode 100644
index fd2225f6..00000000
--- a/functions/k8s-confs/shuffle-rolebinding.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: pod-manager-binding
-  namespace: shuffle
-subjects:
-- kind: ServiceAccount
-  name: default
-  namespace: shuffle
-roleRef:
-  kind: Role
-  name: pod-manager
-  apiGroup: rbac.authorization.k8s.io
-
diff --git a/functions/final-specs/final-specs/shuffle-backend.yaml b/functions/kubernetes/shuffle-backend.yaml
similarity index 100%
rename from functions/final-specs/final-specs/shuffle-backend.yaml
rename to functions/kubernetes/shuffle-backend.yaml
diff --git a/functions/final-specs/final-specs/shuffle-cm.yaml b/functions/kubernetes/shuffle-cm.yaml
similarity index 100%
rename from functions/final-specs/final-specs/shuffle-cm.yaml
rename to functions/kubernetes/shuffle-cm.yaml
diff --git a/functions/final-specs/final-specs/shuffle-frontend.yaml b/functions/kubernetes/shuffle-frontend.yaml
similarity index 100%
rename from functions/final-specs/final-specs/shuffle-frontend.yaml
rename to functions/kubernetes/shuffle-frontend.yaml
diff --git a/functions/final-specs/final-specs/shuffle-opensearch.yaml b/functions/kubernetes/shuffle-opensearch.yaml
similarity index 100%
rename from functions/final-specs/final-specs/shuffle-opensearch.yaml
rename to functions/kubernetes/shuffle-opensearch.yaml
diff --git a/functions/final-specs/final-specs/shuffle-orborus.yaml b/functions/kubernetes/shuffle-orborus.yaml
similarity index 100%
rename from functions/final-specs/final-specs/shuffle-orborus.yaml
rename to functions/kubernetes/shuffle-orborus.yaml
diff --git a/functions/final-specs/final-specs/shuffle-role.yaml b/functions/kubernetes/shuffle-role.yaml
similarity index 100%
rename from functions/final-specs/final-specs/shuffle-role.yaml
rename to functions/kubernetes/shuffle-role.yaml
diff --git a/functions/final-specs/final-specs/shuffle-rolebinding.yaml b/functions/kubernetes/shuffle-rolebinding.yaml
similarity index 100%
rename from functions/final-specs/final-specs/shuffle-rolebinding.yaml
rename to functions/kubernetes/shuffle-rolebinding.yaml
diff --git a/functions/final-specs/final-specs/shuffle-sc.yaml b/functions/kubernetes/shuffle-sc.yaml
similarity index 100%
rename from functions/final-specs/final-specs/shuffle-sc.yaml
rename to functions/kubernetes/shuffle-sc.yaml