diff --git a/.github/workflows/release-horizon-rxt.yml b/.github/workflows/release-horizon-rxt.yml
index b8682826..e6b4563d 100644
--- a/.github/workflows/release-horizon-rxt.yml
+++ b/.github/workflows/release-horizon-rxt.yml
@@ -5,8 +5,17 @@ name: Create and publish a the Horizon RXT compatible image
 on:
   workflow_dispatch:
     inputs:
-      release:
-        description: 'Set release used for the build'
+      imageTag:
+        description: 'Set tag for the image'
+        required: true
+        default: 'master-ubuntu_jammy'
+        type: choice
+        options:
+          - master-ubuntu_jammy
+          - 2023.1-ubuntu_jammy
+          - 2023.2-ubuntu_jammy
+      pluginTag:
+        description: 'Set release used for the build environment'
         required: true
         default: 'master'
         type: choice
@@ -54,7 +63,8 @@ jobs:
           file: Containerfiles/HorizonRXT-Containerfile
           push: true
           tags: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/horizon-rxt:${{ github.event.inputs.release }}-ubuntu_jammy
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/horizon-rxt:${{ github.event.inputs.pluginTag }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            VERSION=${{ github.event.inputs.release }}
+            VERSION=${{ github.event.inputs.imageTag }}
+            PLUGIN_VERSION=${{ github.event.inputs.pluginTag }}
diff --git a/Containerfiles/HorizonRXT-Containerfile b/Containerfiles/HorizonRXT-Containerfile
index 8e6f5a15..8f6f2028 100644
--- a/Containerfiles/HorizonRXT-Containerfile
+++ b/Containerfiles/HorizonRXT-Containerfile
@@ -1,5 +1,6 @@
-ARG VERSION=master
-FROM openstackhelm/horizon:${VERSION}-ubuntu_jammy
-RUN /var/lib/openstack/bin/pip install --constraint=https://releases.openstack.org/constraints/upper/${VERSION} \
+ARG VERSION=master-ubuntu_jammy
+FROM openstackhelm/horizon:${VERSION}
+ARG PLUGIN_VERSION=master
+RUN /var/lib/openstack/bin/pip install --constraint=https://releases.openstack.org/constraints/upper/${PLUGIN_VERSION} \
                                heat-dashboard \
                                octavia-dashboard