diff --git a/src/flextype/flextype.php b/src/flextype/flextype.php
index 3cb0c35d..133d057a 100644
--- a/src/flextype/flextype.php
+++ b/src/flextype/flextype.php
@@ -344,24 +344,24 @@ parsers()->shortcodes()->initShortcodes();
 // Add Serializers Service
 container()->set('serializers', new Serializers());
 
-// Add Image Service
+// Add Images Service
 container()->set('images', static function () {
     // Get image settings
     $imagesSettings = ['driver' => registry()->get('flextype.settings.images.driver')];
 
     // Set source filesystem
     $source = new Flysystem(
-        new Local(PATH['project'] . '/uploads/')
+        new Local(PATH['project'] . registry()->get('flextype.settings.images.directory')),
     );
 
     // Set cache filesystem
     $cache = new Flysystem(
-        new Local(PATH['tmp'] . '/glide')
+        new Local(PATH['tmp'] . registry()->get('flextype.settings.images.cache.directory'))
     );
 
     // Set watermarks filesystem
     $watermarks = new Flysystem(
-        new Local(PATH['project'] . '/watermarks')
+        new Local(PATH['project'] . registry()->get('flextype.settings.images.watermarks.directory'))
     );
 
     // Set image manager
diff --git a/src/flextype/settings.yaml b/src/flextype/settings.yaml
index 443b904e..bc03a664 100644
--- a/src/flextype/settings.yaml
+++ b/src/flextype/settings.yaml
@@ -654,6 +654,26 @@ upload:
     image:
       quality: 70
 
+# Images
+#
+# - driver:               Images driver (gd, imagick)
+#
+# - directory:            Images directory.
+#
+# - watermarks.directory: Watermarks directory.
+#
+# - cache.enabled:        Set to true to enable images caching.
+#
+# - cache.directory:      Images cache directory.
+images:
+  driver: gd
+  directory: '/uploads'
+  watermarks: 
+    directory: '/watermarks'
+  cache:
+    directory: '/images'
+    
+
 # Session
 #
 # Set session options before you start the session