diff --git a/.devcontainer/devcontainer.json b/.devcontainer/default/devcontainer.json
similarity index 88%
rename from .devcontainer/devcontainer.json
rename to .devcontainer/default/devcontainer.json
index e96e24bf..c195fd57 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/default/devcontainer.json
@@ -1,5 +1,5 @@
 {
-	"name": "JetKVM",
+	"name": "JetKVM Default",
 	"image": "mcr.microsoft.com/devcontainers/go:1-1.23-bookworm",
 	"features": {
 		"ghcr.io/devcontainers/features/node:1": {
diff --git a/.devcontainer/podman/devcontainer.json b/.devcontainer/podman/devcontainer.json
new file mode 100644
index 00000000..9419b6a8
--- /dev/null
+++ b/.devcontainer/podman/devcontainer.json
@@ -0,0 +1,19 @@
+{
+	"name": "JetKVM Podman",
+	"image": "mcr.microsoft.com/devcontainers/go:1-1.23-bookworm",
+	"features": {
+		"ghcr.io/devcontainers/features/node:1": {
+			// Should match what is defined in ui/package.json
+			"version": "21.1.0"
+		}
+	},
+	"runArgs": [
+		"--userns=keep-id",
+		"--security-opt=label=disable",
+		"--security-opt=label=nested"
+	],
+	"containerUser": "vscode",
+	"containerEnv": {
+		"HOME": "/home/vscode"
+	}
+}
\ No newline at end of file
diff --git a/dev_deploy.sh b/dev_deploy.sh
index a106395b..d7794842 100755
--- a/dev_deploy.sh
+++ b/dev_deploy.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Exit immediately if a command exits with a non-zero status
 set -e