diff --git a/composer.json b/composer.json
index 89dac03393..93003e454f 100755
--- a/composer.json
+++ b/composer.json
@@ -84,6 +84,7 @@
         "essence/essence": "~3.0",
         "ezyang/htmlpurifier": "~4.12",
         "firebase/php-jwt": "^5.0",
+        "friendsofsymfony/ckeditor-bundle": "^2.2",
         "friendsofsymfony/jsrouting-bundle": "~2.0",
         "graphp/algorithms": "~0.8",
         "graphp/graphviz": "~0.2",
@@ -183,11 +184,6 @@
             "cache:clear": "symfony-cmd",
             "assets:install %PUBLIC_DIR%": "symfony-cmd"
         },
-        "install-ckeditor": {
-            "ckeditor:install %PUBLIC_DIR%/libs/ckeditor --clear=keep --tag=4.13.0 --exclude=samples --exclude=adapters ": "symfony-cmd",
-            "security-checker security:check": "script",
-            "requirements-checker": "script"
-        },
         "post-install-cmd": [
             "@auto-scripts",
             "@install-ckeditor"
diff --git a/config/bundles.php b/config/bundles.php
index a792e5d4f7..c3536ded55 100644
--- a/config/bundles.php
+++ b/config/bundles.php
@@ -38,4 +38,5 @@ return [
     Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
     SymfonyCasts\Bundle\ResetPassword\SymfonyCastsResetPasswordBundle::class => ['all' => true],
     Symplify\ParameterNameGuard\ParameterNameGuardBundle::class => ['dev' => true, 'test' => true],
+    FOS\CKEditorBundle\FOSCKEditorBundle::class => ['all' => true],
 ];
diff --git a/src/CoreBundle/Resources/views/Layout/head.html.twig b/src/CoreBundle/Resources/views/Layout/head.html.twig
index 436630a02f..9fda9cf723 100644
--- a/src/CoreBundle/Resources/views/Layout/head.html.twig
+++ b/src/CoreBundle/Resources/views/Layout/head.html.twig
@@ -41,7 +41,7 @@
 <script src="{{ url('home') ~ 'build/runtime.js' }}"></script>
 <script src="{{ url('home') ~ 'build/app.js' }}"></script>
 {#{{ encore_entry_script_tags('app') }}#}
-<script src="{{ url('home') ~ 'libs/ckeditor/ckeditor.js' }}"></script>
+<script src="{{ url('home') ~ 'build/ckeditor/ckeditor.js' }}"></script>
 {# Add third party js libraries that can't be loaded using webpack #}
 {#<script src="{{ asset('libs/readmore-js/readmore.js') }}"></script>#}
 <script src="{{ url('home') ~ 'build/libs/js-cookie/src/js.cookie.js' }}"></script>
diff --git a/webpack.config.js b/webpack.config.js
index 5ebddf7635..43aedc2c37 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -75,7 +75,12 @@ Encore
             from: './node_modules/js-cookie/src/',
             pattern: /(js.cookie.js)$/,
             to: 'libs/js-cookie/src/js.cookie.js'
-        }
+        },
+        {from: './node_modules/ckeditor/', to: 'ckeditor/[path][name].[ext]', pattern: /\.(js|css)$/, includeSubdirectories: false},
+        {from: './node_modules/ckeditor/adapters', to: 'ckeditor/adapters/[path][name].[ext]'},
+        {from: './node_modules/ckeditor/lang', to: 'ckeditor/lang/[path][name].[ext]'},
+        {from: './node_modules/ckeditor/plugins', to: 'ckeditor/plugins/[path][name].[ext]'},
+        {from: './node_modules/ckeditor/skins', to: 'ckeditor/skins/[path][name].[ext]'},
         /*,
         {
             from: './node_modules/mathjax/',