diff --git a/audio-video/openshot.yaml b/audio-video/openshot.yaml
deleted file mode 100644
index fa41e28..0000000
--- a/audio-video/openshot.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-apiVersion: stream.space/v1alpha1
-kind: Template
-metadata:
-  name: openshot
-  namespace: workspaces
-  annotations:
-    streamspace.dev/image-status: pending-migration
-spec:
-  displayName: Openshot
-  description: OpenShot Video Editor is an award-winning free and open-source video
-    editor for Linux, Mac, and Windows, and is dedicated to delivering high quality
-    video editing and animation solutions to the world.
-  category: Audio & Video
-  baseImage: lscr.io/linuxserver/openshot: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:
-  - openshot
-  - audio--video
diff --git a/design/digikam.yaml b/design/digikam.yaml
deleted file mode 100644
index 783c0b2..0000000
--- a/design/digikam.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-apiVersion: stream.space/v1alpha1
-kind: Template
-metadata:
-  name: digikam
-  namespace: workspaces
-  annotations:
-    streamspace.dev/image-status: pending-migration
-spec:
-  displayName: Digikam
-  description: 'digiKam : Professional Photo Management with the Power of Open Source'
-  category: Design & Graphics
-  baseImage: lscr.io/linuxserver/digikam:latest
-  defaultResources:
-    memory: 4Gi
-    cpu: 2000m
-  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:
-  - digikam
-  - design--graphics
diff --git a/design/rawtherapee.yaml b/design/rawtherapee.yaml
deleted file mode 100644
index 9f4507e..0000000
--- a/design/rawtherapee.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-apiVersion: stream.space/v1alpha1
-kind: Template
-metadata:
-  name: rawtherapee
-  namespace: workspaces
-  annotations:
-    streamspace.dev/image-status: pending-migration
-spec:
-  displayName: Rawtherapee
-  description: RawTherapee is a free, cross-platform raw image processing program!
-  category: Design & Graphics
-  baseImage: lscr.io/linuxserver/rawtherapee:latest
-  defaultResources:
-    memory: 4Gi
-    cpu: 2000m
-  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:
-  - rawtherapee
-  - design--graphics
diff --git a/images/digikam-selkies/Dockerfile b/images/digikam-selkies/Dockerfile
new file mode 100644
index 0000000..a5df1b9
--- /dev/null
+++ b/images/digikam-selkies/Dockerfile
@@ -0,0 +1,22 @@
+# StreamSpace digiKam with Selkies-GStreamer (WebRTC)
+#
+# digiKam is the KDE photo manager — library management, RAW
+# processing, tagging, batch operations. Mount your photo library at
+# runtime (typically /home/user/Pictures or a mounted volume).
+
+FROM ghcr.io/streamspace-dev/selkies-base:latest
+
+LABEL org.opencontainers.image.title="StreamSpace digiKam"
+LABEL org.opencontainers.image.description="digiKam KDE photo 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 digikam && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+USER user
+CMD ["digikam"]
diff --git a/images/digikam-selkies/PLATFORMS b/images/digikam-selkies/PLATFORMS
new file mode 100644
index 0000000..303dc7a
--- /dev/null
+++ b/images/digikam-selkies/PLATFORMS
@@ -0,0 +1 @@
+linux/amd64
diff --git a/images/openshot-selkies/Dockerfile b/images/openshot-selkies/Dockerfile
new file mode 100644
index 0000000..16d3853
--- /dev/null
+++ b/images/openshot-selkies/Dockerfile
@@ -0,0 +1,23 @@
+# StreamSpace OpenShot with Selkies-GStreamer (WebRTC)
+#
+# OpenShot is a non-linear video editor — alternative to kdenlive
+# with a friendlier interface for casual use. Note the apt package is
+# named `openshot-qt` (the older `openshot` package was the GTK1 build
+# and is gone).
+
+FROM ghcr.io/streamspace-dev/selkies-base:latest
+
+LABEL org.opencontainers.image.title="StreamSpace OpenShot"
+LABEL org.opencontainers.image.description="OpenShot video editor 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 openshot-qt && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+USER user
+CMD ["openshot-qt"]
diff --git a/images/openshot-selkies/PLATFORMS b/images/openshot-selkies/PLATFORMS
new file mode 100644
index 0000000..303dc7a
--- /dev/null
+++ b/images/openshot-selkies/PLATFORMS
@@ -0,0 +1 @@
+linux/amd64
diff --git a/images/rawtherapee-selkies/Dockerfile b/images/rawtherapee-selkies/Dockerfile
new file mode 100644
index 0000000..1e48da4
--- /dev/null
+++ b/images/rawtherapee-selkies/Dockerfile
@@ -0,0 +1,23 @@
+# StreamSpace RawTherapee with Selkies-GStreamer (WebRTC)
+#
+# RawTherapee is a raw image converter and photo processor —
+# alternative to darktable with a different feature set (e.g.
+# RawTherapee has stronger noise reduction; darktable has stronger
+# library management).
+
+FROM ghcr.io/streamspace-dev/selkies-base:latest
+
+LABEL org.opencontainers.image.title="StreamSpace RawTherapee"
+LABEL org.opencontainers.image.description="RawTherapee RAW photo processor 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 rawtherapee && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+USER user
+CMD ["rawtherapee"]
diff --git a/images/rawtherapee-selkies/PLATFORMS b/images/rawtherapee-selkies/PLATFORMS
new file mode 100644
index 0000000..303dc7a
--- /dev/null
+++ b/images/rawtherapee-selkies/PLATFORMS
@@ -0,0 +1 @@
+linux/amd64
diff --git a/images/remmina-selkies/Dockerfile b/images/remmina-selkies/Dockerfile
new file mode 100644
index 0000000..ba52053
--- /dev/null
+++ b/images/remmina-selkies/Dockerfile
@@ -0,0 +1,23 @@
+# StreamSpace Remmina with Selkies-GStreamer (WebRTC)
+#
+# Remmina is a GTK remote desktop client — RDP, VNC, SPICE, X2Go,
+# SSH. Useful in the streaming-as-a-jump-host pattern: connect via
+# Selkies in your browser, then use Remmina inside it to reach other
+# remote desktops on a private network.
+
+FROM ghcr.io/streamspace-dev/selkies-base:latest
+
+LABEL org.opencontainers.image.title="StreamSpace Remmina"
+LABEL org.opencontainers.image.description="Remmina GTK remote desktop client 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 remmina && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+USER user
+CMD ["remmina"]
diff --git a/images/remmina-selkies/PLATFORMS b/images/remmina-selkies/PLATFORMS
new file mode 100644
index 0000000..303dc7a
--- /dev/null
+++ b/images/remmina-selkies/PLATFORMS
@@ -0,0 +1 @@
+linux/amd64
diff --git a/images/rustdesk-selkies/Dockerfile b/images/rustdesk-selkies/Dockerfile
new file mode 100644
index 0000000..6ad8af2
--- /dev/null
+++ b/images/rustdesk-selkies/Dockerfile
@@ -0,0 +1,29 @@
+# StreamSpace RustDesk with Selkies-GStreamer (WebRTC)
+#
+# RustDesk is an open-source remote desktop / TeamViewer alternative.
+# Vendor .deb from rustdesk/rustdesk GitHub releases.
+
+FROM ghcr.io/streamspace-dev/selkies-base:latest
+
+LABEL org.opencontainers.image.title="StreamSpace RustDesk"
+LABEL org.opencontainers.image.description="RustDesk remote desktop client 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 set -eux; \
+    deb_url="$(curl -fsSL https://api.github.com/repos/rustdesk/rustdesk/releases/latest \
+        | jq -r '.assets[] | select(.name | test("^rustdesk-.*-x86_64\\.deb$")) | .browser_download_url' \
+        | head -1)"; \
+    if [ -z "${deb_url}" ]; then echo "Could not resolve RustDesk .deb URL" >&2; exit 1; fi; \
+    curl -fsSL -o /tmp/rustdesk.deb "${deb_url}"; \
+    apt-get update; \
+    apt-get install -y --no-install-recommends /tmp/rustdesk.deb; \
+    rm -f /tmp/rustdesk.deb; \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+USER user
+CMD ["rustdesk"]
diff --git a/images/rustdesk-selkies/PLATFORMS b/images/rustdesk-selkies/PLATFORMS
new file mode 100644
index 0000000..303dc7a
--- /dev/null
+++ b/images/rustdesk-selkies/PLATFORMS
@@ -0,0 +1 @@
+linux/amd64
diff --git a/productivity/obsidian.yaml b/productivity/obsidian.yaml
deleted file mode 100644
index 1680cff..0000000
--- a/productivity/obsidian.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-apiVersion: stream.space/v1alpha1
-kind: Template
-metadata:
-  name: obsidian
-  namespace: workspaces
-  annotations:
-    streamspace.dev/image-status: pending-migration
-spec:
-  displayName: Obsidian
-  description: Obsidian is a note-taking app that lets you create, link, and organize
-    your notes on your device, with hundreds of plugins and themes to customize your
-    workflow. You can also publish your notes online, access them offline, and sync
-    them securely with end-to-end encryption.
-  category: Productivity
-  baseImage: lscr.io/linuxserver/obsidian:latest
-  defaultResources:
-    memory: 3Gi
-    cpu: 1500m
-  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:
-  - obsidian
-  - productivity
diff --git a/remote-desktop/remmina.yaml b/remote-desktop/remmina.yaml
deleted file mode 100644
index 84111a6..0000000
--- a/remote-desktop/remmina.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-apiVersion: stream.space/v1alpha1
-kind: Template
-metadata:
-  name: remmina
-  namespace: workspaces
-  annotations:
-    streamspace.dev/image-status: pending-migration
-spec:
-  displayName: Remmina
-  description: Remmina is a remote desktop client written in GTK, aiming to be useful
-    for system administrators and travellers, who need to work with lots of remote
-    computers in front of either large or tiny screens. Remmina supports multiple
-    network protocols, in an integrated and consistent user interface. Currently RDP,
-    VNC, SPICE, SSH and EXEC are supported.
-  category: Remote Desktop
-  baseImage: lscr.io/linuxserver/remmina: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:
-  - remmina
-  - remote-desktop
diff --git a/remote-desktop/rustdesk.yaml b/remote-desktop/rustdesk.yaml
deleted file mode 100644
index 2613d8f..0000000
--- a/remote-desktop/rustdesk.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: stream.space/v1alpha1
-kind: Template
-metadata:
-  name: rustdesk
-  namespace: workspaces
-  annotations:
-    streamspace.dev/image-status: pending-migration
-spec:
-  displayName: Rustdesk
-  description: RustDesk is a full-featured open source remote control alternative
-    for self-hosting and security with minimal configuration.
-  category: Remote Desktop
-  baseImage: lscr.io/linuxserver/rustdesk: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:
-  - rustdesk
-  - remote-desktop
diff --git a/selkies/digikam-selkies.yaml b/selkies/digikam-selkies.yaml
new file mode 100644
index 0000000..8c807c6
--- /dev/null
+++ b/selkies/digikam-selkies.yaml
@@ -0,0 +1,49 @@
+apiVersion: stream.space/v1alpha1
+kind: Template
+metadata:
+  name: digikam-selkies
+  namespace: workspaces
+  labels:
+    app.kubernetes.io/name: digikam-selkies
+    app.kubernetes.io/component: template
+    streamspace.io/category: design-graphics
+    streamspace.io/streaming-protocol: selkies
+  annotations:
+    streamspace.dev/image-status: published
+spec:
+  displayName: digiKam
+  description: digiKam KDE photo manager (library, RAW, tagging, batch ops) streamed via Selkies-GStreamer (WebRTC). Mount your photo library at runtime.
+  category: Design & Graphics
+  icon: https://raw.githubusercontent.com/streamspace-dev/streamspace/main/ui/public/icons/digikam.svg
+  baseImage: ghcr.io/streamspace-dev/digikam-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: 'false'
+  capabilities:
+  - Network
+  - Clipboard
+  tags:
+  - design
+  - photo
+  - library
+  - kde
+  - digikam
+  - selkies
diff --git a/selkies/openshot-selkies.yaml b/selkies/openshot-selkies.yaml
new file mode 100644
index 0000000..d4bf9ca
--- /dev/null
+++ b/selkies/openshot-selkies.yaml
@@ -0,0 +1,48 @@
+apiVersion: stream.space/v1alpha1
+kind: Template
+metadata:
+  name: openshot-selkies
+  namespace: workspaces
+  labels:
+    app.kubernetes.io/name: openshot-selkies
+    app.kubernetes.io/component: template
+    streamspace.io/category: audio-video
+    streamspace.io/streaming-protocol: selkies
+  annotations:
+    streamspace.dev/image-status: published
+spec:
+  displayName: OpenShot
+  description: OpenShot non-linear video editor streamed via Selkies-GStreamer (WebRTC).
+  category: Audio & Video
+  icon: https://raw.githubusercontent.com/streamspace-dev/streamspace/main/ui/public/icons/openshot.svg
+  baseImage: ghcr.io/streamspace-dev/openshot-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
+  - video-editor
+  - openshot
+  - selkies
diff --git a/selkies/rawtherapee-selkies.yaml b/selkies/rawtherapee-selkies.yaml
new file mode 100644
index 0000000..d3e00b1
--- /dev/null
+++ b/selkies/rawtherapee-selkies.yaml
@@ -0,0 +1,48 @@
+apiVersion: stream.space/v1alpha1
+kind: Template
+metadata:
+  name: rawtherapee-selkies
+  namespace: workspaces
+  labels:
+    app.kubernetes.io/name: rawtherapee-selkies
+    app.kubernetes.io/component: template
+    streamspace.io/category: design-graphics
+    streamspace.io/streaming-protocol: selkies
+  annotations:
+    streamspace.dev/image-status: published
+spec:
+  displayName: RawTherapee
+  description: RawTherapee RAW image converter and photo processor streamed via Selkies-GStreamer (WebRTC).
+  category: Design & Graphics
+  icon: https://raw.githubusercontent.com/streamspace-dev/streamspace/main/ui/public/icons/rawtherapee.svg
+  baseImage: ghcr.io/streamspace-dev/rawtherapee-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: 'false'
+  capabilities:
+  - Network
+  - Clipboard
+  tags:
+  - design
+  - photo
+  - raw
+  - rawtherapee
+  - selkies
diff --git a/selkies/remmina-selkies.yaml b/selkies/remmina-selkies.yaml
new file mode 100644
index 0000000..065e913
--- /dev/null
+++ b/selkies/remmina-selkies.yaml
@@ -0,0 +1,49 @@
+apiVersion: stream.space/v1alpha1
+kind: Template
+metadata:
+  name: remmina-selkies
+  namespace: workspaces
+  labels:
+    app.kubernetes.io/name: remmina-selkies
+    app.kubernetes.io/component: template
+    streamspace.io/category: remote-desktop
+    streamspace.io/streaming-protocol: selkies
+  annotations:
+    streamspace.dev/image-status: published
+spec:
+  displayName: Remmina
+  description: Remmina GTK remote desktop client (RDP, VNC, SPICE, X2Go, SSH) streamed via Selkies-GStreamer (WebRTC).
+  category: Remote Desktop
+  icon: https://raw.githubusercontent.com/streamspace-dev/streamspace/main/ui/public/icons/remmina.svg
+  baseImage: ghcr.io/streamspace-dev/remmina-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:
+  - remote-desktop
+  - rdp
+  - vnc
+  - remmina
+  - selkies
diff --git a/selkies/rustdesk-selkies.yaml b/selkies/rustdesk-selkies.yaml
new file mode 100644
index 0000000..b559957
--- /dev/null
+++ b/selkies/rustdesk-selkies.yaml
@@ -0,0 +1,48 @@
+apiVersion: stream.space/v1alpha1
+kind: Template
+metadata:
+  name: rustdesk-selkies
+  namespace: workspaces
+  labels:
+    app.kubernetes.io/name: rustdesk-selkies
+    app.kubernetes.io/component: template
+    streamspace.io/category: remote-desktop
+    streamspace.io/streaming-protocol: selkies
+  annotations:
+    streamspace.dev/image-status: published
+spec:
+  displayName: RustDesk
+  description: RustDesk open-source remote desktop client (TeamViewer alternative) streamed via Selkies-GStreamer (WebRTC).
+  category: Remote Desktop
+  icon: https://raw.githubusercontent.com/streamspace-dev/streamspace/main/ui/public/icons/rustdesk.svg
+  baseImage: ghcr.io/streamspace-dev/rustdesk-selkies:latest
+  streamingProtocol: selkies
+  defaultResources:
+    requests:
+      memory: 2Gi
+      cpu: 1000m
+    limits:
+      memory: 2Gi
+      cpu: 2000m
+  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:
+  - remote-desktop
+  - teamviewer-alternative
+  - rustdesk
+  - selkies