diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 00000000..3140861a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,32 @@
+---
+name: Bug Report
+about: Create a report to help us improve
+title: "[BUG] "
+assignees: ""
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Environment (please complete the following information):**
+
+-   Envionement [Cloud, Docker, Self-hosted, etc.]
+-   Browser [e.g. chrome, safari]
+-   OpnForm Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/deployment-issue.md b/.github/ISSUE_TEMPLATE/deployment-issue.md
new file mode 100644
index 00000000..1c6f72ad
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/deployment-issue.md
@@ -0,0 +1,44 @@
+---
+name: Deployment/Self-hosted Issue
+about: Report an issue related to deployment or self-hosting
+title: "[DEPLOYMENT] "
+labels: deployment
+assignees: ""
+---
+
+**Describe the issue**
+A clear and concise description of the deployment or self-hosting issue you're experiencing.
+
+**Deployment Environment**
+
+-   OpnForm Version: [e.g. 1.0.22]
+-   Hosting Platform: [e.g. AWS, DigitalOcean, Self-hosted server]
+-   OS: [e.g. Ubuntu 20.04, CentOS 8]
+
+**Deployment Method**
+
+-   [ ] Docker
+-   [ ] Manual installation
+-   [ ] Other (please specify)
+
+**Steps Taken**
+Describe the steps you've taken to deploy the application:
+
+1.
+2.
+3.
+
+**Error Messages**
+If applicable, provide any error messages or logs related to the issue. If it's only a generic error message (e.g. "Server Error") please set `APP_DEBUG=true` in `api/.env`, try again and provide use the error message.
+
+**Configuration Files**
+If relevant, provide snippets of your configuration files (make sure to remove any sensitive information).
+
+**Logs**
+To help us diagnose the issue, please provide the following logs:
+
+-   `laravel.log` in `api/storage/logs` on the back-end image
+-   Nuxt logs in the client docker logs
+
+**Additional context**
+Add any other context about the deployment issue here.
diff --git a/api/.env.docker b/api/.env.docker
index bd080361..9c4e66d5 100644
--- a/api/.env.docker
+++ b/api/.env.docker
@@ -12,7 +12,10 @@ LOG_LEVEL=debug
 FILESYSTEM_DRIVER=local
 
 BROADCAST_CONNECTION=log
+
 CACHE_STORE=redis
+CACHE_DRIVER=redis
+
 QUEUE_CONNECTION=redis
 SESSION_DRIVER=redis
 SESSION_LIFETIME=120
diff --git a/docker/Dockerfile.client b/docker/Dockerfile.client
index b8d68c9c..a169bdbf 100644
--- a/docker/Dockerfile.client
+++ b/docker/Dockerfile.client
@@ -26,8 +26,5 @@ FROM node:20-alpine
 WORKDIR /app
 COPY --from=javascript-builder /app/.output/ /app/
 RUN ls /app/
-ADD ./docker/node-entrypoint /entrypoint.sh
-RUN chmod a+x /entrypoint.sh
 
-ENTRYPOINT [ "/entrypoint.sh" ]
 CMD [ "node", "./server/index.mjs" ]
diff --git a/docker/node-entrypoint b/docker/node-entrypoint
deleted file mode 100644
index 12eb9e0f..00000000
--- a/docker/node-entrypoint
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-main() {
-    if [ "$1" = "bash" ]; then
-        "$@"
-    else
-        if [ -f .env ]; then
-            . .env
-        else
-            echo "Warning: .env file not found"
-        fi
-        run_server "$@"
-    fi
-}
-
-run_server() {
-    echo "Running node $@"
-    "$@"
-}
-
-main "$@"
\ No newline at end of file