diff --git a/backend/Dockerfile b/backend/Dockerfile
index 40b231027d..8cb7508e24 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -31,5 +31,6 @@ CMD ["./service"]
 ### Scaffolder Stage
 ### needs extra cookiecutter
 FROM default AS scaffolder
-RUN apt-get update && apt-get install -y python-pip
+RUN apt-get update && apt-get install -y python-pip 
+RUN apt-get install -y python-backports.functools-lru-cache
 RUN pip install cookiecutter==1.7.0 --index-url https://pypi.python.org/simple
diff --git a/frontend/packages/plugins/create-entity/src/components/CreateEntityFormPage/CreateEntityFormPage.tsx b/frontend/packages/plugins/create-entity/src/components/CreateEntityFormPage/CreateEntityFormPage.tsx
index d596079509..7409cad25c 100644
--- a/frontend/packages/plugins/create-entity/src/components/CreateEntityFormPage/CreateEntityFormPage.tsx
+++ b/frontend/packages/plugins/create-entity/src/components/CreateEntityFormPage/CreateEntityFormPage.tsx
@@ -23,17 +23,14 @@ const CreateEntityFormPage = () => {
       description: '',
     },
     onSubmit: (values: any) => {
-      console.log(JSON.stringify(values, null, 2));
-      console.log(google_protobuf_struct_pb);
       const client = new scaffolderV1.Client('http://localhost:8080');
       const req = new scaffolderV1.CreateRequest();
       req.setComponentId(values.entityId);
       req.setTemplateId(templateId);
+
       req.setMetadata(
-        new google_protobuf_struct_pb.Struct({
-          fields: {
-            description: values.description,
-          },
+        new google_protobuf_struct_pb.Struct.fromJavaScript({
+          description: values.description,
         }),
       );
       req.setPrivate(false);