diff --git a/components/gitpod-protocol/go/gitpod-service.go b/components/gitpod-protocol/go/gitpod-service.go
index fcfe6f925f..8330edc4d4 100644
--- a/components/gitpod-protocol/go/gitpod-service.go
+++ b/components/gitpod-protocol/go/gitpod-service.go
@@ -1986,8 +1986,11 @@ type UpdateOwnAuthProviderParams struct {
 
 // CreateWorkspaceOptions is the CreateWorkspaceOptions message type
 type CreateWorkspaceOptions struct {
-	ContextURL string `json:"contextUrl,omitempty"`
-	Mode       string `json:"mode,omitempty"`
+	ContextURL                         string `json:"contextUrl,omitempty"`
+	IgnoreRunningWorkspaceOnSameCommit bool   `json:"ignoreRunningWorkspaceOnSameCommit,omitemopty"`
+	IgnoreRunningPrebuild              bool   `json:"ignoreRunningPrebuild,omitemopty"`
+	AllowUsingPreviousPrebuilds        bool   `json:"allowUsingPreviousPrebuilds,omitemopty"`
+	ForceDefaultConfig                 bool   `json:"forceDefaultConfig,omitemopty"`
 }
 
 // DeleteOwnAuthProviderParams is the DeleteOwnAuthProviderParams message type
diff --git a/test/pkg/integration/workspace.go b/test/pkg/integration/workspace.go
index 886fa2a602..fec8ae1bd5 100644
--- a/test/pkg/integration/workspace.go
+++ b/test/pkg/integration/workspace.go
@@ -257,8 +257,9 @@ func LaunchWorkspaceFromContextURL(t *testing.T, ctx context.Context, contextURL
 
 	t.Logf("attemp to create the workspace: %s", contextURL)
 	resp, err := server.CreateWorkspace(cctx, &protocol.CreateWorkspaceOptions{
-		ContextURL: contextURL,
-		Mode:       "force-new",
+		ContextURL:                         contextURL,
+		IgnoreRunningPrebuild:              true,
+		IgnoreRunningWorkspaceOnSameCommit: true,
 	})
 	if err != nil {
 		return nil, nil, xerrors.Errorf("cannot start workspace: %q", err)
diff --git a/test/tests/components/server/server_test.go b/test/tests/components/server/server_test.go
index 031f594f3f..49fba57e66 100644
--- a/test/tests/components/server/server_test.go
+++ b/test/tests/components/server/server_test.go
@@ -67,8 +67,9 @@ func TestStartWorkspace(t *testing.T) {
 			}
 
 			resp, err := server.CreateWorkspace(ctx, &protocol.CreateWorkspaceOptions{
-				ContextURL: "github.com/gitpod-io/gitpod",
-				Mode:       "force-new",
+				ContextURL:                         "github.com/gitpod-io/gitpod",
+				IgnoreRunningPrebuild:              true,
+				IgnoreRunningWorkspaceOnSameCommit: true,
 			})
 			if err != nil {
 				t.Fatalf("cannot start workspace: %q", err)