diff --git a/backend/scaffolder/app/server.go b/backend/scaffolder/app/server.go
index d3422e1819..9678a3fe79 100644
--- a/backend/scaffolder/app/server.go
+++ b/backend/scaffolder/app/server.go
@@ -39,8 +39,9 @@ func (s *Server) Create(ctx context.Context, req *pb.CreateRequest) (*pb.CreateR
 		Org:     req.Org,
 		Private: req.Private,
 	}
+
 	if _, err := s.github.CreateRepository(repo); err != nil {
-		return nil, status.Error(codes.Internal, fmt.Sprintf("Could not create repository %s/%s", req.Org, req.ComponentId))
+		return nil, status.Error(codes.Internal, fmt.Sprintf("Could not create repository %s/%s %s", req.Org, req.ComponentId, err))
 	}
 
 	// move the template into a temporary directory
@@ -51,7 +52,7 @@ func (s *Server) Create(ctx context.Context, req *pb.CreateRequest) (*pb.CreateR
 	)
 
 	if err != nil {
-		return nil, status.Error(codes.Internal, "Could not prepare the template")
+		return nil, status.Error(codes.Internal, fmt.Sprintf("Could not prepare the template %s", err))
 	}
 
 	// get the optional metadatafields from the json
@@ -59,7 +60,7 @@ func (s *Server) Create(ctx context.Context, req *pb.CreateRequest) (*pb.CreateR
 	cutterMetadata, err := marshaler.MarshalToString(req.Metadata)
 
 	if err != nil {
-		return nil, status.Error(codes.Internal, "Could not marshal the cookiecutter metadata")
+		return nil, status.Error(codes.Internal, fmt.Sprintf("Could not marshal the cookiecutter metadata %s", err))
 	}
 
 	cookieTemplate := lib.CookieCutterTemplate{
@@ -86,7 +87,7 @@ func (s *Server) Create(ctx context.Context, req *pb.CreateRequest) (*pb.CreateR
 	}
 
 	if err := s.git.Push(pushOptions); err != nil {
-		return nil, status.Error(codes.Internal, "Failed to push the repository to Github")
+		return nil, status.Error(codes.Internal, fmt.Sprinf("Failed to push the repository to Github %s", err))
 	}
 
 	return &pb.CreateReply{
diff --git a/backend/scaffolder/lib/git.go b/backend/scaffolder/lib/git.go
index 38306a208b..4ccf818445 100644
--- a/backend/scaffolder/lib/git.go
+++ b/backend/scaffolder/lib/git.go
@@ -23,7 +23,10 @@ type PushRepositoryOptions struct {
 // Push will push the repository to github
 func (g *Git) Push(options PushRepositoryOptions) error {
 	// use git bindings to add the remote with access token and push to the directory
-	repo, err := git.PlainInit(options.TempFolder, false)
+	repo, err := git.PlainInit(
+		fmt.Sprintf("%s/%s", options.TempFolder, options.ComponentID),
+		false,
+	)
 	if err != nil {
 		log.Printf("Failed to init the git repository")
 		return err
diff --git a/backend/scaffolder/templates/react-ssr-template/template-info.json b/backend/scaffolder/templates/react-ssr-template/template-info.json
index 9d99168e07..f1d3efd9fe 100644
--- a/backend/scaffolder/templates/react-ssr-template/template-info.json
+++ b/backend/scaffolder/templates/react-ssr-template/template-info.json
@@ -2,22 +2,5 @@
 	"id": "react-ssr-template",
 	"name": "React SSR",
 	"description": "Next.js application skeleton for creating isomorphic web applications.",
-	"ownerId": "ownerId",
-	"fields": [
-		{
-			"id": "description",
-			"title": "description",
-			"type": "text",
-			"description": "Description of the component",
-			"validators": [
-				{ "type": "required" },
-				{ "type": "string-range", "min": 4, "max": 33 },
-				{
-					"type": "regex",
-					"match": "^[a-z][a-z0-9]+$",
-					"message": "Owner names must consist only of lowercase letters"
-				}
-			]
-		}
-	]
+	"ownerId": "ownerId"
 }
\ No newline at end of file
diff --git a/secrets.env.example b/secrets.env.example
index c83bd2158b..94635d7100 100644
--- a/secrets.env.example
+++ b/secrets.env.example
@@ -2,3 +2,4 @@ NODE_ENV=development
 NODE_DEBUG=true
 REACT_APP_GRAPHQL_API=""
 BOSS_GH_ACCESS_TOKEN=""
+BOSS_GH_USERNAME=""