diff --git a/.github/workflows/publish-latest.yaml b/.github/workflows/publish-latest.yaml
index 6fc522c..6602bac 100644
--- a/.github/workflows/publish-latest.yaml
+++ b/.github/workflows/publish-latest.yaml
@@ -17,13 +17,17 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}
-      - name: Converge
-        uses: werf/actions/build-and-publish@master
+      - name: Push openvpn image to Docker Hub
+        uses: docker/build-push-action@v1
         with:
-          group: 1.1
-          channel: beta
-        env:
-          WERF_STAGES_STORAGE: ":local"
-          WERF_IMAGES_REPO: ${{ secrets.REGISTRY }}
-          WERF_REPO_IMPLEMENTATION: dockerhub
-          WERF_TAG_GIT_TAG: "latest"
\ No newline at end of file
+          tags: flant/openvpn-admin:openvpn-latest
+          context: .
+          file:  Dockerfile.openvpn
+          push: true
+      - name: Push openvpn-admin image to Docker Hub
+        uses: docker/build-push-action@v1
+        with:
+          tags: flant/openvpn-admin:latest
+          file: Dockerfile
+          context: .
+          push: true
diff --git a/.github/workflows/publish-tag.yaml b/.github/workflows/publish-tag.yaml
index b63c3df..b885fc0 100644
--- a/.github/workflows/publish-tag.yaml
+++ b/.github/workflows/publish-tag.yaml
@@ -21,13 +21,18 @@ jobs:
       - name: Get the version
         id: get_version
         run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
-      - name: Converge
-        uses: werf/actions/build-and-publish@master
+      - name: Push openvpn image to Docker Hub
+        uses: docker/build-push-action@v1
         with:
-          group: 1.1
-          channel: beta
-        env:
-          WERF_STAGES_STORAGE: ":local"
-          WERF_IMAGES_REPO: ${{ secrets.REGISTRY }}
-          WERF_REPO_IMPLEMENTATION: dockerhub
-          WERF_TAG_GIT_TAG: ${{ steps.get_version.outputs.VERSION }}
+          tags: flant/openvpn-admin:openvpn-${{ steps.get_version.outputs.VERSION }}
+          context: .
+          file:  Dockerfile.openvpn
+          push: true
+      - name: Push openvpn-admin image to Docker Hub
+        uses: docker/build-push-action@v1
+        with:
+          tags: flant/openvpn-admin:${{ steps.get_version.outputs.VERSION }}
+          file: Dockerfile
+          context: .
+          push: true
+