diff --git a/Dockerfile b/Dockerfile
index 65076f65d..d682a1e6f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,11 +8,7 @@ WORKDIR /app/petclinic
 COPY target/spring-petclinic-3.3.0-SNAPSHOT.jar .
 
 # Expose the port your application runs on
-EXPOSE 8888
+EXPOSE 80
 
 # Set the entry point to run the JAR file
-<<<<<<< HEAD
 ENTRYPOINT ["java", "-jar", "spring-petclinic-3.3.0-SNAPSHOT.jar"]
-=======
-ENTRYPOINT ["java", "-jar", "spring-petclinic-3.3.0-SNAPSHOT.jar"]
->>>>>>> 8307f0d9db8a3ee317049aaf2831afada88ce7f1
diff --git a/Jenkinsfile b/Jenkinsfile
index 0f0edfe85..d47bd6530 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -85,9 +85,6 @@ pipeline {
                 script {
                     withDockerRegistry(credentialsId: 'Docker_cred', toolName: 'Docker') {
                         sh "docker push prasannakumarsinganamalla431/petclinic:${BUILD_NUMBER}"
-                        sh "docker run -d prasannakumarsinganamalla431/petclinic:${BUILD_NUMBER}"
-
-
                     }
                 }
             }    
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 8bd37b988..7dc75cead 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -24,4 +24,4 @@ logging.level.org.springframework=INFO
 # Maximum time static resources should be cached
 spring.web.resources.cache.cachecontrol.max-age=12h
 
-server.port=8888
+server.port=80