diff --git a/src/main/resources/static/images/aws.png b/src/main/resources/static/images/providers/aws.png
similarity index 100%
rename from src/main/resources/static/images/aws.png
rename to src/main/resources/static/images/providers/aws.png
diff --git a/src/main/resources/static/images/providers/azurerm.png b/src/main/resources/static/images/providers/azurerm.png
new file mode 100644
index 000000000..fe2c7d50b
Binary files /dev/null and b/src/main/resources/static/images/providers/azurerm.png differ
diff --git a/src/main/resources/static/images/providers/docker.png b/src/main/resources/static/images/providers/docker.png
new file mode 100644
index 000000000..d83e54a7e
Binary files /dev/null and b/src/main/resources/static/images/providers/docker.png differ
diff --git a/src/main/resources/static/images/providers/google.png b/src/main/resources/static/images/providers/google.png
new file mode 100644
index 000000000..7e23a5cb0
Binary files /dev/null and b/src/main/resources/static/images/providers/google.png differ
diff --git a/src/main/resources/templates/module_description.html b/src/main/resources/templates/module_description.html
index e78c084fa..fdd3044d9 100644
--- a/src/main/resources/templates/module_description.html
+++ b/src/main/resources/templates/module_description.html
@@ -46,7 +46,7 @@
             <div class="col-md-8">
                 <div class="row">
                     <div class="col-md-2">
-                        <img :src="'/images/' + mainProvider + '.png'" :alt="mainProvider"/>
+                        <img :src="'/images/providers/' + mainProvider + '.png'" :alt="mainProvider"/>
                     </div>
                     <div class="col-md-10">
                         <h1>
@@ -107,9 +107,6 @@ <h1>
 
     $.get(`/api/modules/${moduleId}`)
         .then(data => {
-            // START FIXME: link with real data once implemented in the model
-            data.mainProvider = 'aws';
-            // END FIXME
             new Vue({
                 el: "#app",
                 data,