diff --git a/action.yml b/action.yml
index cceb18c..67f667b 100644
--- a/action.yml
+++ b/action.yml
@@ -10,10 +10,18 @@ inputs:
     image_name:
       description: 'Image name'
       required: true
-    aditional_args:
+    docker_version_prefix:
+      description: 'docker image version prefix'
+      required: false
+      default: ''
+    additional_args:
       description: 'Docker build arguments'
       required: false
       default: ''
+    additional_version:
+      description: 'Additional version'
+      required: false
+      default: ''
 outputs:
   image_version:
     description: "Image version"
@@ -32,8 +40,16 @@ runs:
       id: git
       run: echo "::set-output name=short_hash::$(git rev-parse --short HEAD)"
       shell: sh
+    - name: Store image version
+      id: image
+      run: echo "::set-output name=version::${{ inputs.image_name }}:${{inputs.docker_version_prefix}}-${{ steps.git.outputs.short_hash }}"
+      shell: sh
+    - name: Build additional args (version etc.)
+      id: additional_args
+      run: echo "::set-output name=additional_args::$(if [[ "${{inputs.additional_version}}" != "" ]]; then echo "-t ${{ inputs.image_name }}:${{inputs.additional_version}}-${{inputs.docker_version_prefix}}"; else echo ""; fi)"
+      shell: sh
     - name: Build and push docker
       run: |
-        docker build . -t ${{ inputs.image_name }}:${{ steps.git.outputs.short_hash }} ${{ inputs.aditional_args }} && \
+        docker build . -t ${{ inputs.image_name }}:${{inputs.docker_version_prefix}}${{ steps.git.outputs.short_hash }} ${{steps.additional_args.outputs.additional_args}} ${{ inputs.additional_args }} && \
         docker push ${{ inputs.image_name }}:${{ steps.git.outputs.short_hash }}
       shell: sh