diff --git a/components/content-service/pkg/storage/gcloud.go b/components/content-service/pkg/storage/gcloud.go
index f56c24aa797854..8e0845d0c8ed8d 100644
--- a/components/content-service/pkg/storage/gcloud.go
+++ b/components/content-service/pkg/storage/gcloud.go
@@ -761,7 +761,11 @@ func (p *PresignedGCPStorage) EnsureExists(ctx context.Context, bucket string) (
 	if err != nil {
 		return err
 	}
-	defer client.Close()
+	defer func() {
+		if err := client.Close(); err != nil {
+			log.Error("Error in closing client: %v", err)
+		}
+	}()
 
 	return gcpEnsureExists(ctx, client, bucket, p.config)
 }
@@ -772,7 +776,11 @@ func (p *PresignedGCPStorage) DiskUsage(ctx context.Context, bucket string, pref
 	if err != nil {
 		return
 	}
-	defer client.Close()
+	defer func() {
+		if err := client.Close(); err != nil {
+			log.Error("Error in closing client: %v", err)
+		}
+	}()
 
 	ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
 	defer cancel()
@@ -805,7 +813,11 @@ func (p *PresignedGCPStorage) SignDownload(ctx context.Context, bucket, object s
 	if err != nil {
 		return nil, err
 	}
-	defer client.Close()
+	defer func() {
+		if err := client.Close(); err != nil {
+			log.Error("Error in closing client: %v", err)
+		}
+	}()
 
 	bkt := client.Bucket(bucket)
 	_, err = bkt.Attrs(ctx)
@@ -863,7 +875,11 @@ func (p *PresignedGCPStorage) SignUpload(ctx context.Context, bucket, object str
 	if err != nil {
 		return nil, err
 	}
-	defer client.Close()
+	defer func() {
+		if err := client.Close(); err != nil {
+			log.Error("Error in closing client: %v", err)
+		}
+	}()
 
 	bkt := client.Bucket(bucket)
 	_, err = bkt.Attrs(ctx)
@@ -893,7 +909,11 @@ func (p *PresignedGCPStorage) SignUpload(ctx context.Context, bucket, object str
 // DeleteObject deletes objects in the given bucket specified by the given query
 func (p *PresignedGCPStorage) DeleteObject(ctx context.Context, bucket string, query *DeleteObjectQuery) (err error) {
 	client, err := newGCPClient(ctx, p.config)
-	defer client.Close()
+	defer func() {
+		if err := client.Close(); err != nil {
+			log.Error("Error in closing client: %v", err)
+		}
+	}()
 
 	if query.Name != "" {
 		err = client.Bucket(bucket).Object(query.Name).Delete(ctx)
@@ -937,7 +957,11 @@ func (p *PresignedGCPStorage) DeleteObject(ctx context.Context, bucket string, q
 // DeleteBucket deletes a bucket
 func (p *PresignedGCPStorage) DeleteBucket(ctx context.Context, bucket string) (err error) {
 	client, err := newGCPClient(ctx, p.config)
-	defer client.Close()
+	defer func() {
+		if err := client.Close(); err != nil {
+			log.Error("Error in closing client: %v", err)
+		}
+	}()
 
 	err = p.DeleteObject(ctx, bucket, &DeleteObjectQuery{})
 	if err != nil {
@@ -960,7 +984,11 @@ func (p *PresignedGCPStorage) DeleteBucket(ctx context.Context, bucket string) (
 // ObjectHash gets a hash value of an object
 func (p *PresignedGCPStorage) ObjectHash(ctx context.Context, bucket string, obj string) (hash string, err error) {
 	client, err := newGCPClient(ctx, p.config)
-	defer client.Close()
+	defer func() {
+		if err := client.Close(); err != nil {
+			log.Error("Error in closing client: %v", err)
+		}
+	}()
 
 	attr, err := client.Bucket(bucket).Object(obj).Attrs(ctx)
 	if err != nil {
diff --git a/components/gitpod-cli/cmd/preview.go b/components/gitpod-cli/cmd/preview.go
index 6708cc974eb558..32dcc9d9d15a76 100644
--- a/components/gitpod-cli/cmd/preview.go
+++ b/components/gitpod-cli/cmd/preview.go
@@ -19,7 +19,7 @@ import (
 	"github.com/gitpod-io/gitpod/gitpod-cli/pkg/theialib"
 )
 
-var regexLocalhost = regexp.MustCompile("((^(localhost|127\\.0\\.0\\.1))|(https?://(localhost|127\\.0\\.0\\.1)))(:[0-9]+)?")
+var regexLocalhost = regexp.MustCompile(`((^(localhost|127\.0\.0\.1))|(https?:\/\/(localhost|127\.0\.0\.1)))(:[0-9]+)?`)
 
 var previewCmdOpts struct {
 	External bool
diff --git a/components/ws-daemon/pkg/hosts/hosts.go b/components/ws-daemon/pkg/hosts/hosts.go
index 3bc1e67c89a39c..06a747e508d700 100644
--- a/components/ws-daemon/pkg/hosts/hosts.go
+++ b/components/ws-daemon/pkg/hosts/hosts.go
@@ -149,7 +149,12 @@ func (g *DirectController) updateHostsFile(inc <-chan hostUpdate) {
 			if !ok {
 				return xerrors.Errorf("cannot acquire lock")
 			}
-			defer g.unlockHostsFile()
+
+			defer func() {
+				if err := g.unlockHostsFile(); err != nil {
+					log.Error("Error in unlocking hosts file: %v", err)
+				}
+			}()
 
 			_, err = g.hostsFD.Seek(0, 0)
 			if err != nil {
diff --git a/components/ws-daemon/pkg/quota/size.go b/components/ws-daemon/pkg/quota/size.go
index 7fbd1df994336a..d66895d9acd187 100644
--- a/components/ws-daemon/pkg/quota/size.go
+++ b/components/ws-daemon/pkg/quota/size.go
@@ -31,7 +31,7 @@ const (
 )
 
 var (
-	sizeRegexp = regexp.MustCompile("(\\d+)(k|m|g|t)?")
+	sizeRegexp = regexp.MustCompile(`(\d+)(k|m|g|t)?`)
 
 	// ErrInvalidSize is returned by ParseSize if input was not a valid size
 	ErrInvalidSize = errors.New("invalid size")