diff --git a/cmd/provider/main.go b/cmd/provider/main.go
index 6bb9cfed..4fcc5a1d 100644
--- a/cmd/provider/main.go
+++ b/cmd/provider/main.go
@@ -66,7 +66,7 @@ func main() {
 	)
 	kingpin.MustParse(app.Parse(os.Args[1:]))
 
-	zl := zap.New(zap.UseDevMode(*debug), UseJSONencoder())
+	zl := zap.New(zap.UseDevMode(*debug), UseISO8601())
 	log := logging.NewLogrLogger(zl.WithName("provider-terraform"))
 	if *debug {
 		// The controller-runtime runs with a no-op logger by default. It is
@@ -150,11 +150,9 @@ func main() {
 	kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager")
 }
 
-// UseJSONencoder sets the logger to use json format for log records
-func UseJSONencoder() zap.Opts {
+// UseISO8601 sets the logger to use ISO8601 timestamp format
+func UseISO8601() zap.Opts {
 	return func(o *zap.Options) {
-		encoderConfig := zapuber.NewProductionEncoderConfig()
-		encoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
-		o.Encoder = zapcore.NewJSONEncoder(encoderConfig)
+		o.TimeEncoder = zapcore.ISO8601TimeEncoder
 	}
 }
diff --git a/internal/controller/workspace/workspace.go b/internal/controller/workspace/workspace.go
index 3ffc87ab..575e8804 100644
--- a/internal/controller/workspace/workspace.go
+++ b/internal/controller/workspace/workspace.go
@@ -319,7 +319,7 @@ func (c *connector) Connect(ctx context.Context, mg resource.Managed) (managed.E
 		}
 		envs[idx] = strings.Join([]string{env.Name, runtimeVal}, "=")
 	}
-
+	
 	tf := c.terraform(dir, *pc.Spec.PluginCache, cr.Spec.ForProvider.EnableTerraformCLILogging, l, envs...)
 	if cr.Status.AtProvider.Checksum != "" {
 		checksum, err := tf.GenerateChecksum(ctx)
diff --git a/internal/terraform/terraform.go b/internal/terraform/terraform.go
index 1077aced..5f7834c4 100644
--- a/internal/terraform/terraform.go
+++ b/internal/terraform/terraform.go
@@ -32,9 +32,10 @@ import (
 	"sort"
 	"strconv"
 	"strings"
-	"sync"
 	"syscall"
 
+	"sync"
+
 	"github.com/crossplane/crossplane-runtime/pkg/logging"
 	"github.com/pkg/errors"
 )