diff --git a/executor/cmd/root.go b/executor/cmd/root.go
index aacd28dee..5fd0c54dc 100644
--- a/executor/cmd/root.go
+++ b/executor/cmd/root.go
@@ -34,7 +34,7 @@ var (
 )
 
 func init() {
-	RootCmd.PersistentFlags().StringVarP(&dockerfilePath, "dockerfile", "d", "/dockerfile/Dockerfile", "Path to the dockerfile to be built.")
+	RootCmd.PersistentFlags().StringVarP(&dockerfilePath, "dockerfile", "d", "/workspace/Dockerfile", "Path to the dockerfile to be built.")
 	RootCmd.PersistentFlags().StringVarP(&srcContext, "context", "c", "", "Path to the dockerfile build context.")
 	RootCmd.PersistentFlags().StringVarP(&name, "name", "n", "", "Registry the final image should be pushed to (ex: gcr.io/test/example:latest)")
 	RootCmd.PersistentFlags().StringVarP(&logLevel, "verbosity", "v", constants.DefaultLogLevel, "Log level (debug, info, warn, error, fatal, panic")
diff --git a/integration_tests/dockerfiles/Dockerfile b/integration_tests/dockerfiles/Dockerfile
deleted file mode 100644
index f6cfdf83a..000000000
--- a/integration_tests/dockerfiles/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2018 Google, Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM gcr.io/google-appengine/debian9:latest
\ No newline at end of file
diff --git a/integration_tests/integration_test.go b/integration_tests/integration_test.go
deleted file mode 100644
index 02f3e363a..000000000
--- a/integration_tests/integration_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2018 Google LLC
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package integration_tests
-
-import ()
-
-func main() {
-
-}
diff --git a/pkg/util/fs_util.go b/pkg/util/fs_util.go
index 44338d32a..e27e79ffb 100644
--- a/pkg/util/fs_util.go
+++ b/pkg/util/fs_util.go
@@ -27,7 +27,7 @@ import (
 	"strings"
 )
 
-var whitelist = []string{"/work-dir", "/dockerfile"}
+var whitelist = []string{"/workspace"}
 
 // ExtractFileSystemFromImage pulls an image and unpacks it to a file system at root
 func ExtractFileSystemFromImage(img string) error {
diff --git a/pkg/util/fs_util_test.go b/pkg/util/fs_util_test.go
index 3056fe797..b04c113d6 100644
--- a/pkg/util/fs_util_test.go
+++ b/pkg/util/fs_util_test.go
@@ -46,7 +46,7 @@ func Test_fileSystemWhitelist(t *testing.T) {
 	}
 
 	actualWhitelist, err := fileSystemWhitelist(path)
-	expectedWhitelist := []string{"/work-dir", "/dockerfile", "/proc", "/dev", "/dev/pts", "/sys"}
+	expectedWhitelist := []string{"/workspace", "/proc", "/dev", "/dev/pts", "/sys"}
 	sort.Strings(actualWhitelist)
 	sort.Strings(expectedWhitelist)
 	testutil.CheckErrorAndDeepEqual(t, false, err, expectedWhitelist, actualWhitelist)