diff --git a/plugins/activePlugins.json b/plugins/activePlugins.json
index de1f3b76761717e6274708d07b8c0dfac5f4641e..9b940ff945ac7eaa88a391c2bcbd086b3fec9862 100644
--- a/plugins/activePlugins.json
+++ b/plugins/activePlugins.json
@@ -11,6 +11,7 @@
   "codesnippet",
   "codesnippetgeshi",
   "codeTag",
+  "code",
   "colorbutton",
   "colordialog",
   "crossreference",
@@ -51,6 +52,7 @@
   "pre",
   "preview",
   "print",
+  "qui-font-awesome",
   "save",
   "scayt",
   "selectall",
diff --git a/src/QUI/Ckeditor/Plugins/Manager.php b/src/QUI/Ckeditor/Plugins/Manager.php
index 55f64f56a21c7dcde89c3e6ce1bb465ad6a875eb..416bc9704945075e0d0352e4c10d15080f1a335f 100644
--- a/src/QUI/Ckeditor/Plugins/Manager.php
+++ b/src/QUI/Ckeditor/Plugins/Manager.php
@@ -89,10 +89,15 @@ class Manager
                     continue;
                 }
 
+                $pluginName = $entry;
+                // Special case, because gitlab gets confused with the dirctory named "codeTag"
+                if ($entry == "code") {
+                    $pluginName= "codeTag";
+                }
                 # Check if/where the plugin is installed
-                $targetDir = $this->installedPluginDir . "/" . $entry;
-                if (is_dir($this->activePluginDir . "/" . $entry)) {
-                    $targetDir = $this->activePluginDir . "/" . $entry;
+                $targetDir = $this->installedPluginDir . "/" . $pluginName;
+                if (is_dir($this->activePluginDir . "/" . $pluginName)) {
+                    $targetDir = $this->activePluginDir . "/" . $pluginName;
                 }
 
                 if (is_dir($targetDir)) {
@@ -135,24 +140,31 @@ class Manager
             }
 
             foreach (scandir($srcDir) as $entry) {
+                if ($entry == "." || $entry == "..") {
+                    continue;
+                }
+                
+                $pluginName = $entry;
+                // Special case, because gitlab gets confused with the dirctory named "codeTag"
+                if ($entry == "code") {
+                    $pluginName= "codeTag";
+                }
+                
                 $targetDir = $this->installedPluginDir;
                 if (in_array($entry, $activePlugins)) {
                     $targetDir = $this->activePluginDir;
                 }
 
-                if ($entry == "." || $entry == "..") {
-                    continue;
-                }
 
                 if (!is_dir($srcDir . "/" . $entry)) {
                     continue;
                 }
 
-                if (is_dir($this->installedPluginDir . "/" . $entry)) {
+                if (is_dir($this->installedPluginDir . "/" . $pluginName)) {
                     continue;
                 }
 
-                if (is_dir($this->activePluginDir . "/" . $entry)) {
+                if (is_dir($this->activePluginDir . "/" . $pluginName)) {
                     continue;
                 }
 
@@ -160,9 +172,10 @@ class Manager
                     continue;
                 }
 
+                
                 $this->copyDir(
                     $srcDir . "/" . $entry,
-                    $targetDir . "/" . $entry
+                    $targetDir . "/" . $pluginName
                 );
             }
         }