diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 4377a7bd..ec3bb340 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,8 +1,14 @@
 name: Bug report
 description: Create a bug report to help us improve
-title: "[BUG]: "
-labels: ["🐞 bug"]
+#title: "[BUG]: "
+labels: ["bug"]
 body:
+  - type: markdown
+    attributes:
+      value: |
+        ## Please read before submitting a bug report
+        Thanks for taking the time to fill out this bug report. Your feedback helps us improve Kubero.
+        Before you submit, please make sure you have read our [Troubleshooting](https://docs.kubero.dev/Installation/troubleshooting) guide.
   - type: textarea
     id: description
     attributes:
@@ -43,3 +49,10 @@ body:
       description: Is there anything else we should know about this bug report?
     validations:
       required: false
+  - type: textarea
+    id: debug
+    attributes:
+      label: Debug information
+      description: Run `kubero debug` and provide the output. (remove sensitive information)
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 3ba13e0c..0086358d 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1 +1 @@
-blank_issues_enabled: false
+blank_issues_enabled: true
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 572ba01b..ab5179f7 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,7 +1,7 @@
 name: Feature request
 description: Suggest features, propose improvements, discuss new ideas
-title: "[FEATURE]: "
-labels: ["🚀 feature"]
+#title: "[FEATURE]: "
+labels: ["Idea/discussion"]
 body:
   - type: textarea
     id: description
diff --git a/.github/ISSUE_TEMPLATE/other.yml b/.github/ISSUE_TEMPLATE/other.yml
index 650ccfc8..7bfc6ac2 100644
--- a/.github/ISSUE_TEMPLATE/other.yml
+++ b/.github/ISSUE_TEMPLATE/other.yml
@@ -1,7 +1,7 @@
 name: Other issue
 description: Use this for any other issues. Do NOT create blank issues
-title: "[OTHER]: "
-labels: ["🛠 awaiting triage"] # Requires a new label to be created
+#title: "[OTHER]: "
+labels: ["question"]
 body:
   - type: textarea
     id: description
diff --git a/.github/ISSUE_TEMPLATE/template.yml b/.github/ISSUE_TEMPLATE/template.yml
new file mode 100644
index 00000000..5287a092
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/template.yml
@@ -0,0 +1,56 @@
+name: Template
+description: Sugest or request a new template
+title: "Add template for "
+labels: ["template"]
+body:
+  - type: input
+    id: name
+    attributes:
+      label: Application Name
+      description: Name of the application.
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the application
+      description: A clear and concise description of what the bug is.
+    validations:
+      required: true
+  - type: input
+    id: URL
+    attributes:
+      label: URL to the application
+      description: Main URL to the application. 
+    validations:
+      required: false
+  - type: input
+    id: source
+    attributes:
+      label: Source code
+      description: A link to the source code of the application. (if available)
+    validations:
+      required: false
+#  - type: dropdown
+#    attributes:
+#    id: tags
+#      label: select some tags that apply to the application
+#      multiple: true
+#      options:
+#        - Helper
+#        - Developer
+  - type: input
+    id: dockercompose
+    attributes:
+      label: Link to Docker compose
+      description: A link to the Docker compose of the application. (if available)
+    validations:
+      required: false
+  - type: checkboxes
+    id: maintainer
+    attributes:
+      label: Maintainer
+      description: Are you the maintainer of the application?
+      options:
+        - label: I am the maintainer
+          required: false
\ No newline at end of file
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 3236b1d9..5634d771 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -8,6 +8,7 @@ Fixes # (issue)
 
 > Please delete options that are not relevant.
 
+- [ ] Template (non-breaking change which adds a template)
 - [ ] Bug fix (non-breaking change which fixes an issue)
 - [ ] New feature (non-breaking change which adds functionality)
 - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
@@ -17,22 +18,22 @@ Fixes # (issue)
 
 > Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
 
-- [ ] Test A
-- [ ] Test B
+- [ ] I've build the image and tested it on a kubernetes cluster
 
 **Test Configuration**:
 
-- OS with version:
-- Browser with version:
-- SDK / CLI with version:
+- Operator Version:
+- Kubernetes Version:
+- Kubero CLI Version (if applicable):
 
 # Checklist:
 
+- [ ] I removed unnecessary debug logs
 - [ ] My code follows the style guidelines of this project
 - [ ] I have performed a self-review of my code
 - [ ] I documented my code, particularly in hard-to-understand areas
 - [ ] I have made corresponding changes to the documentation
 - [ ] My changes generate no new warnings
-- [ ] I have added tests that prove my fix is effective or that my feature works
-- [ ] New and existing unit tests pass locally with my changes
-- [ ] Any dependent changes have been merged and published in downstream modules
\ No newline at end of file
+<!-- - [ ] I have added tests that prove my fix is effective or that my feature works
+<!-- - [ ] New and existing unit tests pass locally with my changes
+<!-- - [ ] Any dependent changes have been merged and published in downstream modules -->
\ No newline at end of file
diff --git a/client/package.json b/client/package.json
index c7986191..fd3dd206 100644
--- a/client/package.json
+++ b/client/package.json
@@ -42,7 +42,7 @@
     "sass": "^1.60.0",
     "typescript": "^5.0.0",
     "unplugin-fonts": "^1.0.3",
-    "vite": "^4.2.0",
+    "vite": "^4.5.5",
     "vite-plugin-vuetify": "^1.0.0",
     "vue-tsc": "^1.2.0"
   }
diff --git a/client/yarn.lock b/client/yarn.lock
index 71644694..db7d957d 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -1743,10 +1743,10 @@ vite-plugin-vuetify@^1.0.0:
     debug "^4.3.3"
     upath "^2.0.1"
 
-vite@^4.2.0:
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.3.tgz#d88a4529ea58bae97294c7e2e6f0eab39a50fb1a"
-  integrity sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==
+vite@^4.5.5:
+  version "4.5.5"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.5.tgz#639b9feca5c0a3bfe3c60cb630ef28bf219d742e"
+  integrity sha512-ifW3Lb2sMdX+WU91s3R0FyQlAyLxOzCSCP37ujw0+r5POeHPwe6udWVIElKQq8gk3t7b8rkmvqC6IHBpCff4GQ==
   dependencies:
     esbuild "^0.18.10"
     postcss "^8.4.27"
diff --git a/docker-compose.kind.yaml b/docker-compose.kind.yaml
new file mode 100644
index 00000000..f1e13018
--- /dev/null
+++ b/docker-compose.kind.yaml
@@ -0,0 +1,40 @@
+services:
+  # Kubero usually runs in a Kubernetes cluster in the kubero namespace
+  # If you want to run it locally, you can use kind to create a local Kubernetes cluster
+  # 1) Find your cluster name [YOUR_CLUSTER_NAME] by running `kind get clusters`
+  # 2) Set the cluster name in the YOUR_CLUSTER_NAME environment variable `export YOUR_CLUSTER_NAME=...`
+  # 3) run `kind get kubeconfig --name ${YOUR_CLUSTER_NAME} > ./kubeconfig` to get the right config
+  # 4) replace localhost with the IP of your host machine in the extra_hosts section `sed -i'' -e "s/127.0.0.1/${YOUR_CLUSTER_NAME}-control-plane/g" ./kubeconfig`
+  kubero:
+    container_name: "kubero-ui"
+    build:
+      context: .
+      args:
+        - VERSION=Local-Build
+      dockerfile: Dockerfile
+    image: ghcr.io/kubero-dev/kubero/kubero:latest
+    #command: ["tail", "-f", "/dev/null"]
+    env_file:
+      # copy the .env.template file to .env and change the values to your needs
+      - server/.env
+    environment:
+      # change the KUBERO_CONTEXT to the name of your local kind cluster context
+      # you can find the name by running `kubectl config get-contexts`
+      # Must be the same as the context name in the kubeconfig file !
+      #- KUBECONFIG_BASE64=
+      - KUBECONFIG_PATH=./kubeconfig
+      - KUBERO_CONTEXT=kind-${YOUR_CLUSTER_NAME}
+      - KUBERO_NAMESPACE=kubero
+      - KUBERO_SESSION_KEY=randomString
+    ports:
+      # the UI will be available on http://localhost:8000. Make sure the port is not used by another service
+      - "8000:2000"
+    extra_hosts:
+      # if you are using a local Kubernetes cluster, make sure you use the container name from your 
+      # local kind cluster control plane. You can find the name by running `docker ps` and looking for the
+      # container name of the control plane. 192.168.65.254 is your host machine IP address.
+      - "${YOUR_CLUSTER_NAME}-control-plane:192.168.65.254"
+    volumes:
+      - ./kubeconfig:/app/server/kubeconfig
+      - ./server/config.yaml:/app/server/config.yaml
+      - ./server/db:/app/server/db
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 8acc949d..9ebf8ef4 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,7 +1,9 @@
-version: "3"
 services:
   # Kubero usually runs in a Kubernetes cluster in the kubero namespace
-  # If you want to run it locally, you can use kind to create a local Kubernetes cluster
+  # In case you want to run it from a separate container, you can use the following configuration
+  # Make sure yourt cluster is accessible with the kubeconfig file or the KUBECONFIG_BASE64 environment variable
+  # To extract your kubeconfig file from a Kubernetes cluster, you can use the following command:
+  # kubectl config view --raw --minify | base64
   kubero:
     container_name: "kubero-ui"
     build:
@@ -15,24 +17,16 @@ services:
       # copy the .env.template file to .env and change the values to your needs
       - server/.env
     environment:
-      # change the KUBERO_CONTEXT to the name of your local kind cluster context
-      # you can find the name by running `kubectl config get-contexts`
-      # Must be the same as the context name in the kubeconfig file !
-      #- KUBECONFIG_BASE64=
-      - KUBECONFIG_PATH=./kubeconfig
-      - KUBERO_CONTEXT=inClusterContext
+      - KUBECONFIG_BASE64=CHANGE_ME
+      #- KUBECONFIG_PATH=/app/server/kubeconfig
+      - KUBERO_CONTEXT=
       - KUBERO_NAMESPACE=kubero
       - KUBERO_SESSION_KEY=randomString
     ports:
       # the UI will be available on http://localhost:8000. Make sure the port is not used by another service
       - "8000:2000"
-    extra_hosts:
-      # if you are using a local Kubernetes cluster, make sure you use the container name from your 
-      # local kind cluster control plane. You can find the name by running `docker ps` and looking for the
-      # container name of the control plane. 192.168.65.2 is your host machine IP address.
-      - "kubero-001-control-plane:192.168.65.2"
     volumes:
-      # run `kind get kubeconfig --internal --name kubero-001 > ./kubeconfig-docker` to get the right config
-      # modify the server in the config to use the external kubernetes port from your host machine
-      - ./kubeconfig:/app/server/kubeconfig
-      - ./server/config.yaml:/app/server/config.yaml
\ No newline at end of file
+      # copy the config.yaml.template file to config.yaml 
+      - ./server/config.yaml:/app/server/config.yaml
+      - ./server/db:/app/server/db
+      #- ./kubeconfig:/app/server/kubeconfig
\ No newline at end of file