diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
deleted file mode 100644
index ff1bdb18..00000000
--- a/.devcontainer/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM node:20
-
-# alpine linux utilities
-# RUN apk add --no-cache git nano lsof openjdk8-jre
-# RUN apk add --no-cache alpine-sdk python3  
-
-# debian install java runtime
-RUN apt-get update && apt-get install -y default-jre
-
-
-# development tools
-RUN npm i -g @angular/cli @nestjs/cli npm-check-updates
-
-CMD /bin/sh -c "while sleep 1000; do :; done"
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 309989ab..ea3d0e54 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,6 +5,7 @@
   "service": "devcontainer",
   "workspaceFolder": "/workspace",
   "shutdownAction": "stopCompose",
+  "postCreateCommand": "./.devcontainer/post-create.sh",
   "forwardPorts": [
     4200,
     9229,
@@ -12,6 +13,9 @@
     5432,
     "adminer:8080"
   ],
+  "features": {
+    "ghcr.io/devcontainers/features/java:1": {}
+  },
   "customizations": {
     "vscode": {
       "extensions": [
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 8191d07e..8d9fae72 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -2,40 +2,36 @@ name: bosan_interni_sekce_development
 
 services:
   devcontainer:
-    container_name: ${COMPOSE_PROJECT_NAME:-bosan-interni-dev}-devcontainer
-    build: "."
+    image: mcr.microsoft.com/devcontainers/typescript-node:1-22
+    command: sleep infinity
     volumes:
       - ..:/workspace:cached
     environment:
       ENV_TITLE: "DEV"
-      DB_HOST: ${COMPOSE_PROJECT_NAME:-bosan-interni-dev}-postgres
+      DB_HOST: postgres
       DB_USER: postgres
       DB_PASSWORD: password
       DB_DATABASE: postgres
       DB_SCHEMA: public
-      MONGODB_URI: mongodb://${COMPOSE_PROJECT_NAME:-bosan-interni-dev}-mongo/bosan
+      MONGODB_URI: mongodb://mongo/bosan
       CORS_ENABLE: "true"
       CORS_ORIGINS: "http://localhost:4200,http://localhost:4300"
 
   postgres:
-    container_name: ${COMPOSE_PROJECT_NAME:-bosan-interni-dev}-postgres
     image: postgres:15
     environment:
       POSTGRES_PASSWORD: password
 
   adminer:
-    container_name: ${COMPOSE_PROJECT_NAME:-bosan-interni-dev}-adminer
     image: adminer
 
   mongo:
-    container_name: ${COMPOSE_PROJECT_NAME:-bosan-interni-dev}-mongo
     image: mongo:4.2
     environment:
       MONGO_INITDB_DATABASE: bosan
 
   mongoexpress:
-    container_name: ${COMPOSE_PROJECT_NAME:-bosan-interni-dev}-mongoexpress
     image: mongo-express
     environment:
-      ME_CONFIG_MONGODB_SERVER: ${COMPOSE_PROJECT_NAME:-bosan-interni-dev}-mongo
+      ME_CONFIG_MONGODB_SERVER: mongo
       ME_CONFIG_MONGODB_ENABLE_ADMIN: "true"
diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
new file mode 100755
index 00000000..a2fd5741
--- /dev/null
+++ b/.devcontainer/post-create.sh
@@ -0,0 +1,3 @@
+#!/bin/bash -e
+
+npm i -g @angular/cli @nestjs/cli @smallhillcz/sdk
\ No newline at end of file