diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 000000000..95f2e4d6b
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,45 @@
+name: Publish Docker image
+on:
+  workflow_dispatch:
+  push:
+    branches: [master, vnext]
+    paths: ['src/Microsoft.OpenApi.Hidi/**', '.github/workflows/**']
+env:
+  REGISTRY: msgraphprod.azurecr.io
+  IMAGE_NAME: public/hidi
+jobs:
+  push_to_registry:
+    environment:
+      name: acr
+    name: Push Docker image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+      - name: Login to GitHub package feed
+        uses: docker/login-action@v2.0.0 
+        with:
+          username: ${{ secrets.ACR_USERNAME }}
+          password: ${{ secrets.ACR_PASSWORD }}
+          registry: ${{ env.REGISTRY }}
+      - run: |
+          $content = [XML](Get-Content ./src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj)
+          $version = $content.Project.PropertyGroup.Version
+          echo "::set-output name=version::${version}"
+        shell: pwsh
+        id: getversion
+        if: contains(github.ref, 'refs/tags/v')
+        env:
+          BRANCH_NAME: ${{ github.ref }}
+      - name: Push to GitHub Packages - Nightly
+        if: contains(github.ref, 'refs/head/vnext')
+        uses: docker/build-push-action@v3.0.0
+        with:
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly
+      - name: Push to GitHub Packages - Release
+        if: contains(github.ref, 'refs/head/master')
+        uses: docker/build-push-action@v3.0.0
+        with:
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.getversion.outputs.version }}
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..8326ce3b9
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,21 @@
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
+WORKDIR /app
+
+COPY ./src ./hidi/src
+WORKDIR /app/hidi
+RUN dotnet publish ./src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj -c Release
+
+FROM mcr.microsoft.com/dotnet/runtime:6.0 as runtime
+WORKDIR /app
+
+COPY --from=build-env /app/hidi/src/Microsoft.OpenApi.Hidi/bin/Release/net6.0 ./
+
+VOLUME /app/output
+VOLUME /app/openapi.yml
+VOLUME /app/api.csdl
+VOLUME /app/collection.json
+ENV HIDI_CONTAINER=true DOTNET_TieredPGO=1 DOTNET_TC_QuickJitForLoops=1
+ENTRYPOINT ["dotnet", "Microsoft.OpenApi.Hidi.dll"]
+LABEL description="# Welcome to Hidi \
+To start transforming OpenAPI documents checkout [the getting started documentation](https://github.com/microsoft/OpenAPI.NET/tree/vnext/src/Microsoft.OpenApi.Hidi)  \
+[Source dockerfile](https://github.com/microsoft/OpenAPI.NET/blob/vnext/Dockerfile)"