diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae777e743..fdf9e0f6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Changelog
 ### 2021
+* `september`
+	* added [ArekSredzki/electron-release-server](https://github.com/ArekSredzki/electron-release-server/) support.
 * `august`
 	* splited `tc-agents` with `nodejs`
 	* fixed `PostgreSQL` images
diff --git a/linux/electron-release-server/Dockerfile b/linux/electron-release-server/Dockerfile
new file mode 100644
index 000000000..ab0a477e7
--- /dev/null
+++ b/linux/electron-release-server/Dockerfile
@@ -0,0 +1,27 @@
+FROM epicmorg/edge as bootstrap
+RUN cd /tmp && \
+    git clone https://github.com/ArekSredzki/electron-release-server.git && \
+    tree
+
+FROM node:10
+# Create app directory
+RUN mkdir - p  /usr/src/electron-release-server
+WORKDIR /usr/src/electron-release-server
+
+# Install app dependencies
+COPY --from=bootstrap /tmp/electron-release-server/package.json  /usr/src/electron-release-server/
+COPY --from=bootstrap /tmp/electron-release-server/.bowerrc      /usr/src/electron-release-server/
+COPY --from=bootstrap /tmp/electron-release-server/bower.json    /usr/src/electron-release-server/
+
+RUN npm install \
+  && ./node_modules/.bin/bower install --allow-root \
+  && npm cache clean --force \
+  && npm prune --production
+
+# Bundle app source
+COPY --from=bootstrap /tmp/electron-release-server/ /usr/src/electron-release-server
+COPY --from=bootstrap /tmp/electron-release-server/config/docker.js /usr/src/electron-release-server/config/local.js
+
+EXPOSE 80
+
+CMD [ "npm", "start" ]
diff --git a/linux/electron-release-server/Makefile b/linux/electron-release-server/Makefile
new file mode 100644
index 000000000..82c5a2de6
--- /dev/null
+++ b/linux/electron-release-server/Makefile
@@ -0,0 +1,5 @@
+all: app
+
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/electron-release-server/docker-compose.yml b/linux/electron-release-server/docker-compose.yml
new file mode 100644
index 000000000..0dfcc01c2
--- /dev/null
+++ b/linux/electron-release-server/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/electron-release-server:latest"
+    build:
+      context: .
diff --git a/linux/electron-release-server/docker-compose.yml.example b/linux/electron-release-server/docker-compose.yml.example
new file mode 100644
index 000000000..c28e81905
--- /dev/null
+++ b/linux/electron-release-server/docker-compose.yml.example
@@ -0,0 +1,29 @@
+version: '2'
+services:
+  web:
+    build: .
+    environment:
+      APP_USERNAME: username
+      APP_PASSWORD: password
+      DB_HOST: db
+      DB_PORT: 5432
+      DB_USERNAME: releaseserver
+      DB_NAME: releaseserver
+      DB_PASSWORD: secret
+      TOKEN_SECRET: change_me_in_production
+      APP_URL: 'localhost:5000'
+      ASSETS_PATH: '/usr/src/electron-release-server/releases'
+    depends_on:
+      - db
+    ports:
+      - '5000:80'
+    entrypoint: ./scripts/wait.sh db:5432 -- npm start
+    volumes:
+      - ./releases:/usr/src/electron-release-server/releases
+  db:
+    image: postgres:11
+    environment:
+      POSTGRES_PASSWORD: secret
+      POSTGRES_USER: releaseserver
+    volumes:
+      - ./postgresql:/var/lib/postgresql/data
diff --git a/linux/epicmorg/prod/main/.selected_editor b/linux/epicmorg/prod/main/.selected_editor
new file mode 100644
index 000000000..dbc007294
--- /dev/null
+++ b/linux/epicmorg/prod/main/.selected_editor
@@ -0,0 +1,2 @@
+# Generated by /usr/bin/select-editor
+SELECTED_EDITOR="/usr/bin/mcedit"
diff --git a/linux/epicmorg/prod/main/Dockerfile b/linux/epicmorg/prod/main/Dockerfile
index db8e4b4a1..a7a9564eb 100644
--- a/linux/epicmorg/prod/main/Dockerfile
+++ b/linux/epicmorg/prod/main/Dockerfile
@@ -71,7 +71,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
     tini \
     tmux \
     tree \
-    ttf-dejavu \
     util-linux \
     uuid-runtime \
     wget \
@@ -80,6 +79,13 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
     chmod +x /usr/bin/p4 && \
     openssl dhparam -out /etc/ssl/dhparam.pem 4096
 
+##################################################################
+#                   Post-cosmetics
+##################################################################
+COPY ./.selected_editor /root/.selected_editor
+COPY ./mc.patch /tmp/mc.patch
+#RUN patch /tmp/mc.patch /root/.config/mc/ini
+
 ##################################################################
 #                   cleaninig up
 ##################################################################
@@ -87,4 +93,5 @@ RUN apt purge policykit-1 -y && \
     apt clean -y && \
     apt autoclean -y && \
     rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/mc.patch && \
     rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/epicmorg/prod/main/mc.patch b/linux/epicmorg/prod/main/mc.patch
new file mode 100644
index 000000000..075948e1d
--- /dev/null
+++ b/linux/epicmorg/prod/main/mc.patch
@@ -0,0 +1,17 @@
+86,88c86
+< skin=default
+< 
+< filepos_max_saved_entries=1024
+---
+> skin=dark
+109c107
+< display_codepage=ASCII
+---
+> display_codepage=UTF-8
+132c130
+< navigate_with_arrows=false
+---
+> navigate_with_arrows=true
+140a139,140
+> 
+> simple_swap=false