diff --git a/Makefile b/Makefile
index 919d480bd..02c9c73f5 100644
--- a/Makefile
+++ b/Makefile
@@ -84,7 +84,7 @@ linux: ${SOURCES} $(GENERATED_CRDS)
 macos: ${SOURCES} $(GENERATED_CRDS)
 	GOOS=darwin GOARCH=amd64 CGO_ENABLED=${CGO_ENABLED} go build -o build/macos/${BINARY} ${BUILD_FLAGS} -ldflags "$(LDFLAGS)" $(SOURCES)
 
-docker:
+docker: $(GENERATED_CRDS) ${DOCKERDIR}/${DOCKERFILE}
 	echo `(env)`
 	echo "Tag ${TAG}"
 	echo "Version ${VERSION}"
diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py
index c4f0905c2..62b11f1a8 100644
--- a/e2e/tests/test_e2e.py
+++ b/e2e/tests/test_e2e.py
@@ -72,7 +72,7 @@ class EndToEndTestCase(unittest.TestCase):
                 time.sleep(interval)
 
     @classmethod
-    @timeout_decorator.timeout(1800)
+    @timeout_decorator.timeout(TEST_TIMEOUT_SEC)
     def setUpClass(cls):
         '''
         Deploy operator to a "kind" cluster created by run.sh using examples from /manifests.