diff --git a/Jenkinsfile b/Jenkinsfile
index 9d4e452..353d469 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,39 +1,33 @@
 pipeline {
-    environment {
-        registry = 'https://index.docker.io/v1/'
-        registryCredential = 'Docker_ID'
-        name = 'react-todo-app'
-        dockerImage = ''
-    }
-
-    agent any
-
-    stages {
-        stage('Build Docker Image') {
-            steps {
-                script {
-                    // Your Docker build steps go here
-                    docker.build("${name}:${BUILD_NUMBER}")
-                }
-            }
-        }
-
-        stage('Deploy Docker Image') {
-            steps {
-                script {
-                    // Use Docker Hub credentials directly for authentication
-                    withDockerRegistry([credentialsId: "${registryCredential}", url: "${registry}"]) {
-                        // Docker push steps
-                        docker.image("${name}:${BUILD_NUMBER}").push()
-                    }
-                }
-            }
-        }
+    
+  agent any
 
-        stage('Cleaning up') {
-            steps {
-                sh "docker rmi ${name}:${BUILD_NUMBER}"
-            }
-        }
+  options {
+    buildDiscarder(logRotator(numToKeepStr: '5'))
+  }
+  environment {
+    DOCKERHUB_CREDENTIALS = credentials('Docker_ID')
+  }
+  stages {
+    stage('Build') {
+      steps {
+        sh 'docker build -t westy22/westy-docker-hub:raect-todo-latest .'
+      }
+    }
+    stage('Login') {
+      steps {
+        sh 'echo $DOCKERHUB_CREDENTIALS_PSW | docker login -u $DOCKERHUB_CREDENTIALS_USR --password-stdin'
+      }
+    }
+    stage('Push') {
+      steps {
+        sh 'docker push westy22/westy-docker-hub:raect-todo-latest'
+      }
+    }
+  }
+  post {
+    always {
+      sh 'docker logout'
     }
+  }
 }