diff --git a/.github/workflows/acc-test.yaml b/.github/workflows/acc-test.yaml
index c62503f7..d6b05cbb 100644
--- a/.github/workflows/acc-test.yaml
+++ b/.github/workflows/acc-test.yaml
@@ -1,4 +1,3 @@
----
 name: Acc Tests
 on:
   push:
@@ -9,13 +8,13 @@ on:
     types: ['opened', 'synchronize']
     paths:
       - '**.go'
-      - 'vendor/**'
+      - go.mod
       - '.github/workflows/**'
 
 env:
-  GO_VERSION: "1.16"
   GOPROXY: https://gocenter.io,https://proxy.golang.org,direct
   DEBIAN_FRONTEND: noninteractive
+  DOCKER_CE_VERSION: "5:20.10.1~3-0~ubuntu-focal"
 
 jobs:
   acc-test:
@@ -41,7 +40,7 @@ jobs:
       - run: sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
       - run: sudo apt-get update
       # list available docker versions: apt-cache policy docker-ce 
-      - run: sudo apt-get -y install docker-ce=5:20.10.1~3-0~ubuntu-focal
+      - run: sudo apt-get -y install docker-ce=${DOCKER_CE_VERSION}
       - run: docker version
       # Allow local registry to be insecure
       - run: sudo sed 's/DOCKER_OPTS="/DOCKER_OPTS="--insecure-registry=127.0.0.1:15000 /g' -i /etc/default/docker
diff --git a/.github/workflows/compile.yaml b/.github/workflows/compile.yaml
index 63461005..a8c863ff 100644
--- a/.github/workflows/compile.yaml
+++ b/.github/workflows/compile.yaml
@@ -1,4 +1,3 @@
----
 name: Compile Binaries
 on:
   push:
@@ -9,11 +8,10 @@ on:
     types: ['opened', 'synchronize']
     paths:
       - '**.go'
-      - 'vendor/**'
+      - go.mod
       - '.github/workflows/**'
 
 env:
-  GO_VERSION: "1.16"
   GOPROXY: https://gocenter.io,https://proxy.golang.org,direct
 
 jobs:
diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml
index ab763d04..0447e90e 100644
--- a/.github/workflows/golangci-lint.yaml
+++ b/.github/workflows/golangci-lint.yaml
@@ -1,4 +1,3 @@
----
 name: golangci-lint
 on:
   push:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index fdce4d27..561dca24 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -25,7 +25,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: '1.16'
       - name: Import GPG key
         id: import_gpg
         uses: paultyng/ghaction-import-gpg@v2.1.0
diff --git a/.github/workflows/unit-test.yaml b/.github/workflows/unit-test.yaml
index c60e140a..e2aded46 100644
--- a/.github/workflows/unit-test.yaml
+++ b/.github/workflows/unit-test.yaml
@@ -1,4 +1,3 @@
----
 name: Unit Tests
 on:
   push:
@@ -9,11 +8,10 @@ on:
     types: ['opened', 'synchronize']
     paths:
       - '**.go'
-      - 'vendor/**'
+      - go.mod
       - '.github/workflows/**'
 
 env:
-  GO_VERSION: "1.16"
   GOPROXY: https://gocenter.io,https://proxy.golang.org,direct
 
 jobs:
diff --git a/.github/workflows/website-lint.yaml b/.github/workflows/website-lint.yaml
index ae2c05a0..65517039 100644
--- a/.github/workflows/website-lint.yaml
+++ b/.github/workflows/website-lint.yaml
@@ -1,4 +1,3 @@
----
 name: Docs and Website Lint
 on:
   push:
@@ -14,6 +13,7 @@ on:
 env:
   GO_VERSION: "1.16"
   GOPROXY: https://gocenter.io,https://proxy.golang.org,direct
+  DOCKER_CE_VERSION: "5:20.10.1~3-0~ubuntu-focal"
 
 jobs:
   website-lint-spellcheck-tffmt:
@@ -32,7 +32,7 @@ jobs:
       - run: sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
       - run: sudo apt-get update
       # list available docker versions: apt-cache policy docker-ce 
-      - run: sudo apt-get -y install docker-ce=5:20.10.1~3-0~ubuntu-focal
+      - run: sudo apt-get -y install docker-ce=${DOCKER_CE_VERSION}
       - run: docker version
       - run: make setup
       - run: make website-lint