diff --git a/Dockerfile b/Dockerfile
index 79aaead7f91c..a1eb21a9f908 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,24 @@
-FROM jekyll/jekyll
+FROM bitnami/minideb:latest
 Label MAINTAINER Amir Pourmand
-#install imagemagick tool for convert command
-RUN apk add --no-cache --virtual .build-deps \
-        libxml2-dev \
-        shadow \
-        autoconf \
-        g++ \
-        make \
-    && apk add --no-cache imagemagick-dev imagemagick
+RUN apt-get update -y
+# add locale
+RUN apt-get -y install locales
+# Set the locale
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
+    locale-gen
+ENV LANG en_US.UTF-8  
+ENV LANGUAGE en_US:en  
+ENV LC_ALL en_US.UTF-8  
+
+# add ruby and jekyll
+RUN apt-get install --no-install-recommends ruby-full build-essential zlib1g-dev -y 
+RUN apt-get install imagemagick -y 
+RUN apt-get clean \
+    && rm -rf /var/lib/apt/lists/
+# ENV GEM_HOME='root/gems' \
+#     PATH="root/gems/bin:${PATH}"
+RUN gem install jekyll bundler
+RUN mkdir /srv/jekyll
+ADD Gemfile /srv/jekyll
 WORKDIR /srv/jekyll
-ADD Gemfile /srv/jekyll/
-RUN bundle install
+RUN bundle install
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 411e379cd2a8..e97a971f0aa3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,7 @@ services:
     container_name: al-folio-website
     command: bash -c "
       rm -f Gemfile.lock
-      && bundler exec jekyll serve --watch --port=8080 --host=0.0.0.0 --livereload --verbose"
+      && bundler exec jekyll serve --watch --port=8080 --host=0.0.0.0 --livereload --verbose --trace"
     ports:
       - 8080:8080
     volumes:
diff --git a/docker-local.yml b/docker-local.yml
index f86d93e25fc5..ee332cc58018 100644
--- a/docker-local.yml
+++ b/docker-local.yml
@@ -3,10 +3,11 @@ version: "3"
 services:
   jekyll_custom:
     build: .
+    image: al-folio-local-docker
     container_name: al-folio-local-website
     command: bash -c "
       rm -f Gemfile.lock
-      && bundler exec jekyll serve --watch --port=8080 --host=0.0.0.0 --livereload --verbose"
+      && bundler exec jekyll serve --watch --port=8080 --host=0.0.0.0 --livereload --verbose --trace"
     ports:
       - 8080:8080
     volumes: