diff --git a/server/docker-compose.yml b/server/docker-compose.yml
new file mode 100644
index 0000000..0e3877a
--- /dev/null
+++ b/server/docker-compose.yml
@@ -0,0 +1,62 @@
+version: '3.3'
+
+
+
+services:
+  #service 1: definition of mysql database
+  db:
+    image: mysql:latest
+    container_name: mysql-db
+    environment:
+      - MYSQL_ROOT_PASSWORD=0cscadmin1
+    ports:
+      - "3333:3306"
+    networks:
+      - spring-cloud-network
+    restart: always
+
+    #service 2: definition of phpMyAdmin
+  phpmyadmin:
+    image: phpmyadmin/phpmyadmin:latest
+    container_name: my-php-myadmin
+    ports:
+      - "8082:80"
+    restart: always
+
+    networks:
+      - spring-cloud-network
+    depends_on:
+      - db
+    environment:
+      SPRING_DATASOURCE_USERNAME: root
+      SPRING_DATASOURCE_PASSWORD: 0cscadmin1
+
+
+  #service 3: definition of your spring-boot app
+  cfgserver:                        #it is just a name, which will be used only in this file.
+    image: appserver-service               #name of the image after dockerfile executes
+    container_name: appserver-service-app  #name of the container created from docker image
+
+    build:
+      context: ./restserver          #docker file path (. means root directory)
+      dockerfile: Dockerfile              #docker file name
+    ports:
+      - "8088:8081"                       #docker container port with your os port
+    restart: "no"
+
+    networks:
+      - spring-cloud-network
+    depends_on:                           #define dependencies of this app
+      - db                                #dependency name (which is defined with this name 'db' in this file earlier)
+    environment:
+      SPRING_DATASOURCE_URL: jdbc:mysql://mysql-db:3306/property?createDatabaseIfNotExist=true
+      SPRING_DATASOURCE_USERNAME: root
+      SPRING_DATASOURCE_PASSWORD: 0cscadmin1
+      SPRING_JPA_HIBERNATE_DDL_AUTO: update
+
+
+
+
+networks:
+  spring-cloud-network:
+    driver: bridge
\ No newline at end of file
diff --git a/server/resources/application-ybdev.properties b/server/resources/application-ybdev.properties
index 3638cf7..4a6b221 100644
--- a/server/resources/application-ybdev.properties
+++ b/server/resources/application-ybdev.properties
@@ -6,6 +6,7 @@ spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3306/appvehownserver
 
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
+
 spring.jpa.show-sql=true
 
 spring.jpa.properties.hibernate.jdbc.batch_size=100
diff --git a/server/restserver/Dockerfile b/server/restserver/Dockerfile
new file mode 100644
index 0000000..5bf0357
--- /dev/null
+++ b/server/restserver/Dockerfile
@@ -0,0 +1,12 @@
+
+FROM openjdk:8-jdk-alpine
+
+ARG JAR_FILE=target/*.jar
+ARG JAR_DEPENDENDIES=target/alternateLocation
+
+ARG DEPENDENCY=target/dependency
+COPY ${JAR_FILE} app.jar
+#EXPOSE 3999:3999
+COPY  ${JAR_DEPENDENDIES} ./
+#RUN ls -al
+ENTRYPOINT ["java","-jar","/app.jar"]
diff --git a/server/restserver/pom.xml b/server/restserver/pom.xml
index 707e730..404d597 100644
--- a/server/restserver/pom.xml
+++ b/server/restserver/pom.xml
@@ -90,6 +90,26 @@
                     <useDefaultDelimiters>false</useDefaultDelimiters>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/alternateLocation</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <excludeTransitive>true</excludeTransitive>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <testResources>
             <testResource>
diff --git a/services/src/main/java/eu/csc/ODPAppVehOwnServer/services/LeaseServices.java b/services/src/main/java/eu/csc/ODPAppVehOwnServer/services/LeaseServices.java
index 4ecbb13..22b92c1 100644
--- a/services/src/main/java/eu/csc/ODPAppVehOwnServer/services/LeaseServices.java
+++ b/services/src/main/java/eu/csc/ODPAppVehOwnServer/services/LeaseServices.java
@@ -1,7 +1,6 @@
 package eu.csc.ODPAppVehOwnServer.services;
 
 import asn.GTMaintenance.Lease;
-import eu.csc.odpconfigserver.persistence.leases.ASNLeaseEntity;
 import org.springframework.stereotype.Service;
 
 @Service