diff --git a/audio-video/ardour.yaml b/audio-video/ardour.yaml
deleted file mode 100644
index df992e9..0000000
--- a/audio-video/ardour.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: stream.space/v1alpha1
-kind: Template
-metadata:
-  name: ardour
-  namespace: workspaces
-  annotations:
-    streamspace.dev/image-status: pending-migration
-spec:
-  displayName: Ardour
-  description: Ardour is an open source, collaborative effort of a worldwide team
-    including musicians, programmers, and professional recording engineers.
-  category: Audio & Video
-  baseImage: lscr.io/linuxserver/ardour:latest
-  defaultResources:
-    memory: 3Gi
-    cpu: 1500m
-  ports:
-  - name: http
-    containerPort: 8080
-    protocol: TCP
-  env:
-  - name: PUID
-    value: '1000'
-  - name: PGID
-    value: '1000'
-  - name: TZ
-    value: America/New_York
-  volumeMounts:
-  - name: user-home
-    mountPath: /config
-  capabilities:
-  - Network
-  - Clipboard
-  tags:
-  - ardour
-  - audio--video
diff --git a/audio-video/lollypop.yaml b/audio-video/lollypop.yaml
deleted file mode 100644
index e80d8a9..0000000
--- a/audio-video/lollypop.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: stream.space/v1alpha1
-kind: Template
-metadata:
-  name: lollypop
-  namespace: workspaces
-  annotations:
-    streamspace.dev/image-status: pending-migration
-spec:
-  displayName: Lollypop
-  description: Lollypop is a lightweight modern music player designed to work excellently
-    on the GNOME desktop environment.
-  category: Media
-  baseImage: lscr.io/linuxserver/lollypop:latest
-  defaultResources:
-    memory: 2Gi
-    cpu: 1000m
-  ports:
-  - name: vnc
-    containerPort: 3000
-    protocol: TCP
-  env:
-  - name: PUID
-    value: '1000'
-  - name: PGID
-    value: '1000'
-  - name: TZ
-    value: America/New_York
-  volumeMounts:
-  - name: user-home
-    mountPath: /config
-  capabilities:
-  - Network
-  - Clipboard
-  tags:
-  - lollypop
-  - media
diff --git a/images/ardour-selkies/Dockerfile b/images/ardour-selkies/Dockerfile
new file mode 100644
index 0000000..ffa7ebd
--- /dev/null
+++ b/images/ardour-selkies/Dockerfile
@@ -0,0 +1,21 @@
+# StreamSpace Ardour with Selkies-GStreamer (WebRTC)
+#
+# Ardour is a professional digital audio workstation (DAW). Audio
+# capture / playback works through PulseAudio inside the container.
+
+FROM ghcr.io/streamspace-dev/selkies-base:latest
+
+LABEL org.opencontainers.image.title="StreamSpace Ardour"
+LABEL org.opencontainers.image.description="Ardour digital audio workstation with Selkies-GStreamer (WebRTC) streaming for StreamSpace"
+LABEL org.opencontainers.image.version="1.0.0"
+LABEL org.opencontainers.image.vendor="StreamSpace"
+LABEL org.opencontainers.image.source="https://github.com/streamspace-dev/streamspace-templates"
+
+USER root
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends ardour && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+USER user
+CMD ["ardour"]
diff --git a/images/ardour-selkies/PLATFORMS b/images/ardour-selkies/PLATFORMS
new file mode 100644
index 0000000..303dc7a
--- /dev/null
+++ b/images/ardour-selkies/PLATFORMS
@@ -0,0 +1 @@
+linux/amd64
diff --git a/images/doublecommander-selkies/Dockerfile b/images/doublecommander-selkies/Dockerfile
new file mode 100644
index 0000000..06601b3
--- /dev/null
+++ b/images/doublecommander-selkies/Dockerfile
@@ -0,0 +1,23 @@
+# StreamSpace Double Commander with Selkies-GStreamer (WebRTC)
+#
+# Twin-panel file manager (Total Commander style). We pick the Qt5
+# build (`doublecmd-qt`) over the GTK2 build (`doublecmd-gtk`) — Qt5
+# integrates better with the base image's libraries and the GTK2 one
+# is increasingly legacy.
+
+FROM ghcr.io/streamspace-dev/selkies-base:latest
+
+LABEL org.opencontainers.image.title="StreamSpace Double Commander"
+LABEL org.opencontainers.image.description="Double Commander twin-panel file manager with Selkies-GStreamer (WebRTC) streaming for StreamSpace"
+LABEL org.opencontainers.image.version="1.0.0"
+LABEL org.opencontainers.image.vendor="StreamSpace"
+LABEL org.opencontainers.image.source="https://github.com/streamspace-dev/streamspace-templates"
+
+USER root
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends doublecmd-qt && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+USER user
+CMD ["doublecmd"]
diff --git a/images/doublecommander-selkies/PLATFORMS b/images/doublecommander-selkies/PLATFORMS
new file mode 100644
index 0000000..303dc7a
--- /dev/null
+++ b/images/doublecommander-selkies/PLATFORMS
@@ -0,0 +1 @@
+linux/amd64
diff --git a/images/lmms-selkies/Dockerfile b/images/lmms-selkies/Dockerfile
new file mode 100644
index 0000000..6218b49
--- /dev/null
+++ b/images/lmms-selkies/Dockerfile
@@ -0,0 +1,21 @@
+# StreamSpace LMMS (Linux Multimedia Studio) with Selkies-GStreamer
+#
+# LMMS is an open-source music production app — beat/melody composition,
+# instruments, samples, mixing, automation. Comparable to FL Studio.
+
+FROM ghcr.io/streamspace-dev/selkies-base:latest
+
+LABEL org.opencontainers.image.title="StreamSpace LMMS"
+LABEL org.opencontainers.image.description="LMMS music production studio with Selkies-GStreamer (WebRTC) streaming for StreamSpace"
+LABEL org.opencontainers.image.version="1.0.0"
+LABEL org.opencontainers.image.vendor="StreamSpace"
+LABEL org.opencontainers.image.source="https://github.com/streamspace-dev/streamspace-templates"
+
+USER root
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends lmms && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+USER user
+CMD ["lmms"]
diff --git a/images/lmms-selkies/PLATFORMS b/images/lmms-selkies/PLATFORMS
new file mode 100644
index 0000000..303dc7a
--- /dev/null
+++ b/images/lmms-selkies/PLATFORMS
@@ -0,0 +1 @@
+linux/amd64
diff --git a/images/lollypop-selkies/Dockerfile b/images/lollypop-selkies/Dockerfile
new file mode 100644
index 0000000..8dc69e5
--- /dev/null
+++ b/images/lollypop-selkies/Dockerfile
@@ -0,0 +1,21 @@
+# StreamSpace Lollypop with Selkies-GStreamer (WebRTC)
+#
+# Lollypop is a modern GNOME music player. Mount your music library
+# at runtime (typically /home/user/Music).
+
+FROM ghcr.io/streamspace-dev/selkies-base:latest
+
+LABEL org.opencontainers.image.title="StreamSpace Lollypop"
+LABEL org.opencontainers.image.description="Lollypop GNOME music player with Selkies-GStreamer (WebRTC) streaming for StreamSpace"
+LABEL org.opencontainers.image.version="1.0.0"
+LABEL org.opencontainers.image.vendor="StreamSpace"
+LABEL org.opencontainers.image.source="https://github.com/streamspace-dev/streamspace-templates"
+
+USER root
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends lollypop && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+USER user
+CMD ["lollypop"]
diff --git a/images/lollypop-selkies/PLATFORMS b/images/lollypop-selkies/PLATFORMS
new file mode 100644
index 0000000..303dc7a
--- /dev/null
+++ b/images/lollypop-selkies/PLATFORMS
@@ -0,0 +1 @@
+linux/amd64
diff --git a/images/qdirstat-selkies/Dockerfile b/images/qdirstat-selkies/Dockerfile
new file mode 100644
index 0000000..179be58
--- /dev/null
+++ b/images/qdirstat-selkies/Dockerfile
@@ -0,0 +1,22 @@
+# StreamSpace QDirStat with Selkies-GStreamer (WebRTC)
+#
+# Qt-based interactive directory statistics — what's eating your disk.
+# Useful when running streamed and pointing it at a mounted volume to
+# inspect remote disk usage.
+
+FROM ghcr.io/streamspace-dev/selkies-base:latest
+
+LABEL org.opencontainers.image.title="StreamSpace QDirStat"
+LABEL org.opencontainers.image.description="QDirStat directory statistics tool with Selkies-GStreamer (WebRTC) streaming for StreamSpace"
+LABEL org.opencontainers.image.version="1.0.0"
+LABEL org.opencontainers.image.vendor="StreamSpace"
+LABEL org.opencontainers.image.source="https://github.com/streamspace-dev/streamspace-templates"
+
+USER root
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends qdirstat && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+USER user
+CMD ["qdirstat"]
diff --git a/images/qdirstat-selkies/PLATFORMS b/images/qdirstat-selkies/PLATFORMS
new file mode 100644
index 0000000..303dc7a
--- /dev/null
+++ b/images/qdirstat-selkies/PLATFORMS
@@ -0,0 +1 @@
+linux/amd64
diff --git a/selkies/ardour-selkies.yaml b/selkies/ardour-selkies.yaml
new file mode 100644
index 0000000..bb923cc
--- /dev/null
+++ b/selkies/ardour-selkies.yaml
@@ -0,0 +1,49 @@
+apiVersion: stream.space/v1alpha1
+kind: Template
+metadata:
+  name: ardour-selkies
+  namespace: workspaces
+  labels:
+    app.kubernetes.io/name: ardour-selkies
+    app.kubernetes.io/component: template
+    streamspace.io/category: audio-video
+    streamspace.io/streaming-protocol: selkies
+  annotations:
+    streamspace.dev/image-status: published
+spec:
+  displayName: Ardour
+  description: Ardour professional digital audio workstation streamed via Selkies-GStreamer (WebRTC).
+  category: Audio & Video
+  icon: https://raw.githubusercontent.com/streamspace-dev/streamspace/main/ui/public/icons/ardour.svg
+  baseImage: ghcr.io/streamspace-dev/ardour-selkies:latest
+  streamingProtocol: selkies
+  defaultResources:
+    requests:
+      memory: 4Gi
+      cpu: 2000m
+    limits:
+      memory: 8Gi
+      cpu: 4000m
+  ports:
+  - name: selkies
+    containerPort: 8080
+    protocol: TCP
+  env:
+  - name: TZ
+    value: UTC
+  - name: DISPLAY_SIZEW
+    value: '1920'
+  - name: DISPLAY_SIZEH
+    value: '1080'
+  - name: SELKIES_ENABLE_AUDIO
+    value: 'true'
+  capabilities:
+  - Network
+  - Audio
+  - Clipboard
+  tags:
+  - audio-video
+  - daw
+  - audio
+  - ardour
+  - selkies
diff --git a/selkies/doublecommander-selkies.yaml b/selkies/doublecommander-selkies.yaml
new file mode 100644
index 0000000..6887e8f
--- /dev/null
+++ b/selkies/doublecommander-selkies.yaml
@@ -0,0 +1,47 @@
+apiVersion: stream.space/v1alpha1
+kind: Template
+metadata:
+  name: doublecommander-selkies
+  namespace: workspaces
+  labels:
+    app.kubernetes.io/name: doublecommander-selkies
+    app.kubernetes.io/component: template
+    streamspace.io/category: utilities
+    streamspace.io/streaming-protocol: selkies
+  annotations:
+    streamspace.dev/image-status: published
+spec:
+  displayName: Double Commander
+  description: Double Commander twin-panel file manager (Total Commander style) streamed via Selkies-GStreamer (WebRTC).
+  category: Utilities
+  icon: https://raw.githubusercontent.com/streamspace-dev/streamspace/main/ui/public/icons/doublecommander.svg
+  baseImage: ghcr.io/streamspace-dev/doublecommander-selkies:latest
+  streamingProtocol: selkies
+  defaultResources:
+    requests:
+      memory: 1Gi
+      cpu: 500m
+    limits:
+      memory: 2Gi
+      cpu: 1000m
+  ports:
+  - name: selkies
+    containerPort: 8080
+    protocol: TCP
+  env:
+  - name: TZ
+    value: UTC
+  - name: DISPLAY_SIZEW
+    value: '1920'
+  - name: DISPLAY_SIZEH
+    value: '1080'
+  - name: SELKIES_ENABLE_AUDIO
+    value: 'false'
+  capabilities:
+  - Network
+  - Clipboard
+  tags:
+  - utilities
+  - file-manager
+  - doublecommander
+  - selkies
diff --git a/selkies/lmms-selkies.yaml b/selkies/lmms-selkies.yaml
new file mode 100644
index 0000000..91847ec
--- /dev/null
+++ b/selkies/lmms-selkies.yaml
@@ -0,0 +1,48 @@
+apiVersion: stream.space/v1alpha1
+kind: Template
+metadata:
+  name: lmms-selkies
+  namespace: workspaces
+  labels:
+    app.kubernetes.io/name: lmms-selkies
+    app.kubernetes.io/component: template
+    streamspace.io/category: audio-video
+    streamspace.io/streaming-protocol: selkies
+  annotations:
+    streamspace.dev/image-status: published
+spec:
+  displayName: LMMS
+  description: LMMS (Linux Multimedia Studio) music production app streamed via Selkies-GStreamer (WebRTC).
+  category: Audio & Video
+  icon: https://raw.githubusercontent.com/streamspace-dev/streamspace/main/ui/public/icons/lmms.svg
+  baseImage: ghcr.io/streamspace-dev/lmms-selkies:latest
+  streamingProtocol: selkies
+  defaultResources:
+    requests:
+      memory: 4Gi
+      cpu: 2000m
+    limits:
+      memory: 4Gi
+      cpu: 4000m
+  ports:
+  - name: selkies
+    containerPort: 8080
+    protocol: TCP
+  env:
+  - name: TZ
+    value: UTC
+  - name: DISPLAY_SIZEW
+    value: '1920'
+  - name: DISPLAY_SIZEH
+    value: '1080'
+  - name: SELKIES_ENABLE_AUDIO
+    value: 'true'
+  capabilities:
+  - Network
+  - Audio
+  - Clipboard
+  tags:
+  - audio-video
+  - music-production
+  - lmms
+  - selkies
diff --git a/selkies/lollypop-selkies.yaml b/selkies/lollypop-selkies.yaml
new file mode 100644
index 0000000..16cbc2a
--- /dev/null
+++ b/selkies/lollypop-selkies.yaml
@@ -0,0 +1,48 @@
+apiVersion: stream.space/v1alpha1
+kind: Template
+metadata:
+  name: lollypop-selkies
+  namespace: workspaces
+  labels:
+    app.kubernetes.io/name: lollypop-selkies
+    app.kubernetes.io/component: template
+    streamspace.io/category: audio-video
+    streamspace.io/streaming-protocol: selkies
+  annotations:
+    streamspace.dev/image-status: published
+spec:
+  displayName: Lollypop
+  description: Lollypop modern GNOME music player streamed via Selkies-GStreamer (WebRTC). Mount your music library at runtime.
+  category: Audio & Video
+  icon: https://raw.githubusercontent.com/streamspace-dev/streamspace/main/ui/public/icons/lollypop.svg
+  baseImage: ghcr.io/streamspace-dev/lollypop-selkies:latest
+  streamingProtocol: selkies
+  defaultResources:
+    requests:
+      memory: 1Gi
+      cpu: 500m
+    limits:
+      memory: 2Gi
+      cpu: 1000m
+  ports:
+  - name: selkies
+    containerPort: 8080
+    protocol: TCP
+  env:
+  - name: TZ
+    value: UTC
+  - name: DISPLAY_SIZEW
+    value: '1920'
+  - name: DISPLAY_SIZEH
+    value: '1080'
+  - name: SELKIES_ENABLE_AUDIO
+    value: 'true'
+  capabilities:
+  - Network
+  - Audio
+  - Clipboard
+  tags:
+  - audio-video
+  - music-player
+  - lollypop
+  - selkies
diff --git a/selkies/qdirstat-selkies.yaml b/selkies/qdirstat-selkies.yaml
new file mode 100644
index 0000000..184853e
--- /dev/null
+++ b/selkies/qdirstat-selkies.yaml
@@ -0,0 +1,47 @@
+apiVersion: stream.space/v1alpha1
+kind: Template
+metadata:
+  name: qdirstat-selkies
+  namespace: workspaces
+  labels:
+    app.kubernetes.io/name: qdirstat-selkies
+    app.kubernetes.io/component: template
+    streamspace.io/category: utilities
+    streamspace.io/streaming-protocol: selkies
+  annotations:
+    streamspace.dev/image-status: published
+spec:
+  displayName: QDirStat
+  description: QDirStat Qt-based directory statistics tool — visualize disk usage. Streamed via Selkies-GStreamer (WebRTC).
+  category: Utilities
+  icon: https://raw.githubusercontent.com/streamspace-dev/streamspace/main/ui/public/icons/qdirstat.svg
+  baseImage: ghcr.io/streamspace-dev/qdirstat-selkies:latest
+  streamingProtocol: selkies
+  defaultResources:
+    requests:
+      memory: 1Gi
+      cpu: 500m
+    limits:
+      memory: 2Gi
+      cpu: 1000m
+  ports:
+  - name: selkies
+    containerPort: 8080
+    protocol: TCP
+  env:
+  - name: TZ
+    value: UTC
+  - name: DISPLAY_SIZEW
+    value: '1920'
+  - name: DISPLAY_SIZEH
+    value: '1080'
+  - name: SELKIES_ENABLE_AUDIO
+    value: 'false'
+  capabilities:
+  - Network
+  - Clipboard
+  tags:
+  - utilities
+  - disk-usage
+  - qdirstat
+  - selkies
diff --git a/utilities/doublecommander.yaml b/utilities/doublecommander.yaml
deleted file mode 100644
index d0e9c69..0000000
--- a/utilities/doublecommander.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-apiVersion: stream.space/v1alpha1
-kind: Template
-metadata:
-  name: doublecommander
-  namespace: workspaces
-  annotations:
-    streamspace.dev/image-status: pending-migration
-spec:
-  displayName: Doublecommander
-  description: Double Commander is a free cross platform open source file manager
-    with two panels side by side. It is inspired by Total Commander and features some
-    new ideas.
-  category: Administration,Storage
-  baseImage: lscr.io/linuxserver/doublecommander:latest
-  defaultResources:
-    memory: 2Gi
-    cpu: 1000m
-  ports:
-  - name: http
-    containerPort: 8080
-    protocol: TCP
-  env:
-  - name: PUID
-    value: '1000'
-  - name: PGID
-    value: '1000'
-  - name: TZ
-    value: America/New_York
-  volumeMounts:
-  - name: user-home
-    mountPath: /config
-  capabilities:
-  - Network
-  - Clipboard
-  tags:
-  - doublecommander
-  - administrationstorage
diff --git a/utilities/qdirstat.yaml b/utilities/qdirstat.yaml
deleted file mode 100644
index ae151d7..0000000
--- a/utilities/qdirstat.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: stream.space/v1alpha1
-kind: Template
-metadata:
-  name: qdirstat
-  namespace: workspaces
-  annotations:
-    streamspace.dev/image-status: pending-migration
-spec:
-  displayName: Qdirstat
-  description: 'QDirStat Qt-based directory statistics: KDirStat without any KDE --
-    from the author of the original KDirStat.'
-  category: Storage
-  baseImage: lscr.io/linuxserver/qdirstat:latest
-  defaultResources:
-    memory: 2Gi
-    cpu: 1000m
-  ports:
-  - name: http
-    containerPort: 8080
-    protocol: TCP
-  env:
-  - name: PUID
-    value: '1000'
-  - name: PGID
-    value: '1000'
-  - name: TZ
-    value: America/New_York
-  volumeMounts:
-  - name: user-home
-    mountPath: /config
-  capabilities:
-  - Network
-  - Clipboard
-  tags:
-  - qdirstat
-  - storage