diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml
index 220e4e51a..77bf1bdc1 100644
--- a/.github/workflows/ci-test.yaml
+++ b/.github/workflows/ci-test.yaml
@@ -13,3 +13,19 @@ jobs:
           VERBOSE: true
         run: |
           make local-test
+  stress-test-linux:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: make stress-test
+        env:
+          VERBOSE: true
+        run: |
+          make stress
+  integration-test-on-kind:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: run tests
+        run: |
+          SONOBUOY_CLI=../../build/linux/amd64/sonobuoy ./scripts/run_integration_tests.sh
diff --git a/Dockerfile b/Dockerfile
index 1e5f22413..bb266bcd3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 FROM BASEIMAGE
-MAINTAINER John Schnake "jschnake@vmware.com"
 
 CMD1
 
diff --git a/DockerfileWindows b/DockerfileWindows
index 77a33e787..7272fe2c1 100644
--- a/DockerfileWindows
+++ b/DockerfileWindows
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 FROM BASEIMAGE
-MAINTAINER John Schnake "jschnake@vmware.com"
 
 ADD BINARY /sonobuoy.exe
 WORKDIR /
diff --git a/Makefile b/Makefile
index f849f22d5..14808b0c1 100644
--- a/Makefile
+++ b/Makefile
@@ -112,6 +112,7 @@ pre:
 	 chmod +x ./manifest-tool
 	echo $(DOCKERHUB_TOKEN) | docker login --username sonobuoybot --password-stdin
 
+# TODO: Make it easy to build single container for a specific arch
 build_container:
 	$(DOCKER) build \
        -t $(REGISTRY)/$(TARGET):$(IMAGE_VERSION) \
diff --git a/scripts/run_integration_tests.sh b/scripts/run_integration_tests.sh
index 3c6f97f70..042ee0faf 100755
--- a/scripts/run_integration_tests.sh
+++ b/scripts/run_integration_tests.sh
@@ -9,7 +9,7 @@ cluster="kind"
 testImage="sonobuoy/testimage:v0.1"
 
 if ! kind get clusters | grep -q "^$cluster$"; then
-    kind create cluster --name $cluster
+    kind create cluster --name $cluster --config $DIR/kind-config.yaml
     # Although the cluster has been created, not all the pods in kube-system are created/available
     sleep 20
 fi