diff --git a/src/main/java/_11/asktpk/artisanconnectbackend/controller/ImageController.java b/src/main/java/_11/asktpk/artisanconnectbackend/controller/ImageController.java
index fbb173b..5f75d6c 100644
--- a/src/main/java/_11/asktpk/artisanconnectbackend/controller/ImageController.java
+++ b/src/main/java/_11/asktpk/artisanconnectbackend/controller/ImageController.java
@@ -6,6 +6,7 @@ import _11.asktpk.artisanconnectbackend.service.NoticeService;
 import jakarta.persistence.EntityNotFoundException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
+import org.springframework.data.repository.query.Param;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -29,7 +30,7 @@ public class ImageController {
     private String uploadDir;
 
     @PostMapping("/upload/{id}")
-    public ResponseEntity<RequestResponseDTO> uploadImage(@RequestParam("file") MultipartFile file, @PathVariable("id") Long noticeId) {
+    public ResponseEntity<RequestResponseDTO> uploadImage(@RequestParam("file") MultipartFile file, @PathVariable("id") Long noticeId, @Param("isMainImage") Boolean isMainImage) {
         try {
             if(file.isEmpty()) {
                 return ResponseEntity.badRequest().body(new RequestResponseDTO("File is empty"));
@@ -44,10 +45,11 @@ public class ImageController {
             }
 
             String newImageName = imageService.saveImageToStorage(uploadDir, file);
-            imageService.addImageNameToDB(newImageName, noticeId);
+            imageService.addImageNameToDB(newImageName, noticeId, isMainImage);
 
             return ResponseEntity.ok(new RequestResponseDTO("Image uploaded successfully with new name: " + newImageName));
         } catch (Exception e) {
+            System.out.println(e.getMessage());
             return ResponseEntity.status(HttpStatus.UNSUPPORTED_MEDIA_TYPE).body(new RequestResponseDTO(e.getMessage()));
         }
     }
diff --git a/src/main/java/_11/asktpk/artisanconnectbackend/dto/ImageRequestDTO.java b/src/main/java/_11/asktpk/artisanconnectbackend/dto/ImageRequestDTO.java
deleted file mode 100644
index ff56733..0000000
--- a/src/main/java/_11/asktpk/artisanconnectbackend/dto/ImageRequestDTO.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package _11.asktpk.artisanconnectbackend.dto;
-
-import org.springframework.core.io.Resource;
-
-public class ImageRequestDTO {
-    public Resource image;
-    public Long noticeId;
-    public boolean isMainImage;
-}
diff --git a/src/main/java/_11/asktpk/artisanconnectbackend/service/ImageService.java b/src/main/java/_11/asktpk/artisanconnectbackend/service/ImageService.java
index e1c6702..9a80e32 100644
--- a/src/main/java/_11/asktpk/artisanconnectbackend/service/ImageService.java
+++ b/src/main/java/_11/asktpk/artisanconnectbackend/service/ImageService.java
@@ -40,10 +40,11 @@ public class ImageService {
         return uniqueFileName;
     }
 
-    public void addImageNameToDB(String filename, Long noticeId) {
+    public void addImageNameToDB(String filename, Long noticeId, boolean isMainImage) {
         Image image = new Image();
         image.setImageName(filename);
         image.setNoticeId(noticeId);
+        image.setMainImage(isMainImage);
         imageRepository.save(image);
     }
 
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index ff1cbbe..c3d49fe 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,39 +1,41 @@
 spring.application.name=ArtisanConnectBackend
 
 ## PostgreSQL
-spring.datasource.url=jdbc:postgresql://localhost:5432/postgres
+spring.datasource.url=${DB_URL:jdbc:postgresql://db:5432/postgres}
+spring.datasource.username=${DB_USER:postgres}
+spring.datasource.password=${DB_PASS:postgres}
 spring.datasource.driver-class-name=org.postgresql.Driver
-spring.datasource.username=postgres
-spring.datasource.password=postgres
 
-#initial data for db injection
+#Injekcja danych przyk?adowych przy starcie bazy
 spring.sql.init.data-locations=classpath:sql/data.sql
 spring.sql.init.mode=always
 spring.jpa.defer-datasource-initialization=true
 
-# create and drop table, good for testing, production set to none or comment it
+#Sposób zachowania JPA
 spring.jpa.hibernate.ddl-auto=create-drop
 
-file.upload-dir=/Users/andsol/Desktop/uploads
-spring.servlet.multipart.max-file-size=10MB
-spring.servlet.multipart.max-request-size=10MB
+#Gdzie uploadujemy zdj?cia i maksymalny rozmiar
+file.upload-dir=${IMAGES_UPLOAD_DIR:/app/images}
+spring.servlet.multipart.max-file-size=${MAX_FILE_SIZE:10MB}
+spring.servlet.multipart.max-request-size=${MAX_REQUEST_SIZE:10MB}
 
-spring.mail.host=smtp.sendgrid.net
-spring.mail.port=587
-spring.mail.username=apikey
-spring.mail.password=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
-spring.mail.properties.mail.smtp.auth=true
-spring.mail.properties.mail.smtp.starttls.enable=true
+#Ustawienia wysy?ania maili
+spring.mail.host=${MAIL_HOST}
+spring.mail.port=${MAIL_PORT}
+spring.mail.username=${MAIL_USER}
+spring.mail.password=${MAIL_PASSWORD}
 
-tpay.clientId = 01JQKC048X62ST9V59HNRSXD92-01JQKC2CQHPYXQFSFX8BKC24BX
-tpay.clientSecret = 44898642be53381cdcc47f3e44bf5a15e592f5d270fc3a6cf6fb81a8b8ebffb9
-tpay.authUrl = https://openapi.sandbox.tpay.com/oauth/auth
-tpay.transactionUrl = https://openapi.sandbox.tpay.com/transactions
-tpay.securityCode = )IY7E)YSM!A)Q6O-GN#U7U_33s9qObk8
+#Ustawienia TPay
+tpay.clientId=${TPAY_CLIENT_ID}
+tpay.clientSecret=${TPAY_SECRET}
+tpay.authUrl=${TPAY_AUTH_URL}
+tpay.transactionUrl=${TPAY_TRANSACTION_URL}
+tpay.securityCode = ${TPAY_SECURITY_CODE}
 
-#jwt settings
-jwt.secret=DIXLsOs3FKmCAQwISd0SKsHMXJrPl3IKIRkVlkOvYW7kEcdUTbxh8zFe1B3eZWkY
-jwt.expiration=300000
+#Ustawienia JWT
+jwt.secret=${JWT_SECRET}
+jwt.expiration=1200000
 
+#Ustawienia logowania
 logging.file.name=logs/payment-notifications.log
 logging.level.TpayLogger=INFO
\ No newline at end of file