diff --git a/.github/workflows/master.yml b/.github/workflows/ci.yml
similarity index 71%
rename from .github/workflows/master.yml
rename to .github/workflows/ci.yml
index f35c5d3..9822984 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/ci.yml
@@ -1,25 +1,33 @@
-name: Build
+name: ci
 
 on:
   push:
-    branches: [ master ]
-  # pull_request:
-  #   branches: [ master ]
+    branches:
+      - 'master'
+    tags:
+      - 'v*'
+  pull_request:
+    branches:
+      - 'master'
 
 jobs:
 
   build_and_test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - 
+        uses: actions/checkout@v2
+      - 
+        uses: actions/setup-node@v1
         with:
-          node-version: 14.x
-      - run: yarn install
-      - run: yarn test
+          node-version: 16.x
+      - 
+        run: yarn install
+      - 
+        run: yarn test
+
 
   push_to_registry:
-    needs: build_and_test
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     steps:
@@ -46,5 +54,4 @@ jobs:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
-          labels: latest
-
+          labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
deleted file mode 100644
index 307f1ec..0000000
--- a/.github/workflows/pr.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Test PR
-
-on: pull_request
-
-jobs:
-
-  build_and_test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 14.x
-      - run: yarn install
-      - run: yarn test
-      - run: docker build