diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
index 44f76c6..4a7b901 100644
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@@ -22,6 +22,16 @@ jobs:
       
       - name: Build with Maven
         run: mvn -B package --file pom.xml
+
+      - name: Detect OpenSearch Version
+        id: opensearch
+        run: |
+          echo version=$(mvn -q -Dexec.executable=echo -Dexec.args='${opensearch.version}' --non-recursive exec:exec) >> $GITHUB_OUTPUT
+
+      - name: Detect Plugin Version
+        id: plugin
+        run: |
+          echo version=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec) >> $GITHUB_OUTPUT
       
       - name: Log in to Docker Hub
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
@@ -53,4 +63,7 @@ jobs:
           context: .
           file: ./Dockerfile
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            OPENSEARCH_VERSION=${{ steps.opensearch.outputs.version }}
+            PLUGIN_VERSION=${{ steps.plugin.outputs.version }}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index deff5c7..080edc9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,5 @@
-FROM opensearchproject/opensearch:2.9.0
-COPY target/releases/SynonymsPlugin-2.9.0.0.zip /tmp
-RUN /usr/share/opensearch/bin/opensearch-plugin install --batch file:///tmp/SynonymsPlugin-2.9.0.0.zip
+ARG OPENSEARCH_VERSION
+FROM opensearchproject/opensearch:${OPENSEARCH_VERSION}
+ARG PLUGIN_VERSION
+COPY target/releases/SynonymsPlugin-${PLUGIN_VERSION}.zip /tmp
+RUN /usr/share/opensearch/bin/opensearch-plugin install --batch file:///tmp/SynonymsPlugin-${PLUGIN_VERSION}.zip