diff --git a/src/app/configuration/vmtemplates/edit-vmtemplate/edit-vmtemplate.component.html b/src/app/configuration/vmtemplates/edit-vmtemplate/edit-vmtemplate.component.html
index 95fc0356..5802bcf6 100644
--- a/src/app/configuration/vmtemplates/edit-vmtemplate/edit-vmtemplate.component.html
+++ b/src/app/configuration/vmtemplates/edit-vmtemplate/edit-vmtemplate.component.html
@@ -82,11 +82,12 @@ <h3>Cloud Config</h3>
             </clr-signpost-content>
         </clr-signpost>
         <div [formGroup]="configMap">            
-            <form clrForm style="width: 100%;">
-                <div style="background-color: var(--clr-thead-bgcolor, #fafafa); width: fit-content;padding: 9px; border: 1px solid var(--clr-table-border-color, #cccccc);">
-                    <code class="clr-code" style="white-space: pre; color: var(--clr-table-font-color, #666666);">{{ cloudConfig.cloudConfigYaml }}</code>
+            <form clrForm>
+                <div class="code-container" *ngIf="cloudConfig.cloudConfigYaml.length > 0">
+                    <code class="clr-code">{{ cloudConfig.cloudConfigYaml }}</code>
                 </div>
             </form>
+            <div *ngIf="!cloudConfig.cloudConfigYaml.length">There is no Cloud-Init Configuration defined for this VM-Template. This can be done in the Services Step.</div>
         </div>
         <ng-container *ngIf="configMap && !configMap.valid">
             <span class="clr-subtext">All mappings must have key and value filled out. Complete, or remove, any entries
diff --git a/src/app/configuration/vmtemplates/edit-vmtemplate/edit-vmtemplate.component.scss b/src/app/configuration/vmtemplates/edit-vmtemplate/edit-vmtemplate.component.scss
new file mode 100644
index 00000000..24594ab8
--- /dev/null
+++ b/src/app/configuration/vmtemplates/edit-vmtemplate/edit-vmtemplate.component.scss
@@ -0,0 +1,11 @@
+.clr-code {
+    white-space: pre; 
+    color: var(--clr-table-font-color, #666666);
+}
+
+.code-container {
+    background-color: var(--clr-thead-bgcolor, #fafafa); 
+    width: 100%;    
+    padding: 9px; 
+    border: 1px solid var(--clr-table-border-color, #cccccc);
+}
\ No newline at end of file
diff --git a/src/app/configuration/vmtemplates/edit-vmtemplate/edit-vmtemplate.component.ts b/src/app/configuration/vmtemplates/edit-vmtemplate/edit-vmtemplate.component.ts
index c2365769..d502c5fd 100644
--- a/src/app/configuration/vmtemplates/edit-vmtemplate/edit-vmtemplate.component.ts
+++ b/src/app/configuration/vmtemplates/edit-vmtemplate/edit-vmtemplate.component.ts
@@ -12,6 +12,7 @@ import { VmtemplateService } from 'src/app/data/vmtemplate.service';
 @Component({
   selector: 'edit-vmtemplate-wizard',
   templateUrl: './edit-vmtemplate.component.html',
+  styleUrls: ['./edit-vmtemplate.component.scss']
 })
 export class EditVmtemplateComponent implements OnInit, OnChanges {
   public templateDetails: FormGroup;