diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 6ac210a3e..9f8dbebcf 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -10,7 +10,7 @@ name: Java CI with Maven
 
 on:
   push:
-    branches: [ "main", "refactor" ]
+    branches: [ "main" ]
   pull_request:
     branches: [ "main" ]
 
@@ -38,7 +38,7 @@ jobs:
       uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
 
   container-image:
-    if: github.repository_owner == 'opentransportro' && github.event_name == 'push' && (github.ref == 'refs/heads/main')
+    if: github.repository_owner == 'transittrack' && github.event_name == 'push' && (github.ref == 'refs/heads/main')
     runs-on: ubuntu-latest
     needs:
       - build
@@ -55,9 +55,22 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 18
+
+      - name: Docker setup-buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          install: true
+
+      - name: Docker Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build container image with Jib, push to Dockerhub
         env:
-          CONTAINER_REPO: docker.io/otrro/transitclock-server
+          CONTAINER_REPO: "ghcr.io/transittrack/transittrack"
           CONTAINER_REGISTRY_USER: ${{secrets.DOCKER_USER}}
           CONTAINER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_AUTH }}
         run: |
@@ -77,4 +90,4 @@ jobs:
             echo "Maven version ${version_with_snapshot} contains SNAPSHOT, adding date to container image tag"
           fi
   
-          mvn install jib:build -Djib.to.tags=latest,$image_version
+          mvn install jib:build -Djib.to.tags=$image_version
diff --git a/core/src/main/java/org/transitclock/domain/structs/ExportTable.java b/core/src/main/java/org/transitclock/domain/structs/ExportTable.java
index da52bd282..23f3b32b6 100644
--- a/core/src/main/java/org/transitclock/domain/structs/ExportTable.java
+++ b/core/src/main/java/org/transitclock/domain/structs/ExportTable.java
@@ -44,7 +44,7 @@ public class ExportTable implements Serializable {
     @Column(name = "export_status")
     private int exportStatus;
 
-    @Column(name = "first_name")
+    @Column(name = "file_name")
     private String fileName;
 
     @Column(name = "file")
diff --git a/core/src/main/java/org/transitclock/domain/structs/TravelTimesForTrip.java b/core/src/main/java/org/transitclock/domain/structs/TravelTimesForTrip.java
index 911a17061..19b1eb795 100644
--- a/core/src/main/java/org/transitclock/domain/structs/TravelTimesForTrip.java
+++ b/core/src/main/java/org/transitclock/domain/structs/TravelTimesForTrip.java
@@ -4,16 +4,12 @@
 import com.querydsl.jpa.impl.JPAQuery;
 import jakarta.persistence.*;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 import org.hibernate.annotations.DynamicUpdate;
-import org.transitclock.domain.structs.QTravelTimesForTrip;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -80,10 +76,10 @@ public class TravelTimesForTrip implements Serializable {
     @ManyToMany(fetch = FetchType.EAGER)
     @JoinTable(name = "travel_times_for_trip_to_travel_times_for_path",
             joinColumns = {
-                    @JoinColumn(name = "for_path_id", referencedColumnName = "id")
+                    @JoinColumn(name = "for_trip_id", referencedColumnName = "id")
             },
             inverseJoinColumns = {
-                    @JoinColumn(name = "for_trip_id", referencedColumnName = "id")
+                    @JoinColumn(name = "for_path_id", referencedColumnName = "id")
             })
     @Cascade({CascadeType.SAVE_UPDATE})
     @OrderColumn(name = "list_index")
diff --git a/core/src/main/java/org/transitclock/domain/structs/TripPattern.java b/core/src/main/java/org/transitclock/domain/structs/TripPattern.java
index 55e2af9a8..c7a380c48 100644
--- a/core/src/main/java/org/transitclock/domain/structs/TripPattern.java
+++ b/core/src/main/java/org/transitclock/domain/structs/TripPattern.java
@@ -15,10 +15,8 @@
 
 import jakarta.persistence.*;
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * A trip pattern, as obtained from stop_times.txt GTFS file. A trip pattern defines what stops are
@@ -570,9 +568,9 @@ public boolean isStopAtOrAfterStop(String stopId1, String stopId2) {
      * @return
      */
     public List<String> getStopIds() {
-        List<String> list = new ArrayList<String>(stopPaths.size());
-        for (StopPath stopPath : stopPaths) list.add(stopPath.getStopId());
-        return list;
+        return stopPaths.stream()
+                .map(StopPath::getStopId)
+                .collect(Collectors.toList());
     }
 
     /**
@@ -581,7 +579,9 @@ public List<String> getStopIds() {
      * @return ID of last stop
      */
     public String getLastStopIdForTrip() {
-        return stopPaths.get(stopPaths.size() - 1).getStopId();
+        return Optional.ofNullable(getStopPath(stopPaths.size() - 1))
+                .map(StopPath::getStopId)
+                .orElse(null);
     }
 
     /**
@@ -602,7 +602,8 @@ public double getLength() {
      * @return The specified StopPath or null if index out of range
      */
     public StopPath getStopPath(int index) {
-        if (index < 0 || index >= stopPaths.size()) return null;
+        if (index < 0 || index >= stopPaths.size())
+            return null;
 
         return stopPaths.get(index);
     }
diff --git a/core/src/main/resources/db/migration/V20240516223700__fix-wrong-column-for-export-table.sql b/core/src/main/resources/db/migration/V20240516223700__fix-wrong-column-for-export-table.sql
new file mode 100644
index 000000000..4d7d9bc50
--- /dev/null
+++ b/core/src/main/resources/db/migration/V20240516223700__fix-wrong-column-for-export-table.sql
@@ -0,0 +1 @@
+ALTER TABLE export_table RENAME COLUMN first_name TO file_name;
\ No newline at end of file
diff --git a/core/src/main/resources/db/migration/V20240516223701__fix-wrong-relation.sql b/core/src/main/resources/db/migration/V20240516223701__fix-wrong-relation.sql
new file mode 100644
index 000000000..ed36095e5
--- /dev/null
+++ b/core/src/main/resources/db/migration/V20240516223701__fix-wrong-relation.sql
@@ -0,0 +1,13 @@
+-- removing faulty constraints definitions
+ALTER TABLE travel_times_for_trip_to_travel_times_for_path
+    DROP CONSTRAINT fk_tratimfortritotratimforpat_on_travel_times_for_stop_path;
+
+ALTER TABLE travel_times_for_trip_to_travel_times_for_path
+    DROP CONSTRAINT fk_tratimfortritotratimforpat_on_travel_times_for_trip;
+
+-- recreating new constraints
+ALTER TABLE travel_times_for_trip_to_travel_times_for_path
+    ADD CONSTRAINT fk_tratimfortritotratimforpat_on_travel_times_for_stop_path FOREIGN KEY (for_path_id) REFERENCES travel_times_for_stop_paths (id);
+
+ALTER TABLE travel_times_for_trip_to_travel_times_for_path
+    ADD CONSTRAINT fk_tratimfortritotratimforpat_on_travel_times_for_trip FOREIGN KEY (for_trip_id) REFERENCES travel_times_for_trips (id);
\ No newline at end of file
diff --git a/extensions/traccar/pom.xml b/extensions/traccar/pom.xml
index 84d9605e3..150611f3c 100644
--- a/extensions/traccar/pom.xml
+++ b/extensions/traccar/pom.xml
@@ -29,7 +29,9 @@
               <apiPackage>org.transitclock.extension.traccar.api</apiPackage>
               <invokerPackage>org.transitclock.extension.traccar</invokerPackage>
               <generatorName>java</generatorName>
+              <generateApiTests>false</generateApiTests>
               <generateModels>true</generateModels>
+              <generateModelTests>false</generateModelTests>
               <generateModelDocumentation>false</generateModelDocumentation>
               <modelPackage>org.transitclock.extension.traccar.model</modelPackage>
               <modelNameSuffix>Dto</modelNameSuffix>
@@ -43,6 +45,15 @@
           </execution>
         </executions>
       </plugin>
+
+      <plugin>
+        <groupId>org.gaul</groupId>
+        <artifactId>modernizer-maven-plugin</artifactId>
+        <configuration>
+          <!-- skipping for now cause it generates problem on windows -->
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
diff --git a/pom.xml b/pom.xml
index 3daaad8f0..9f88e4227 100644
--- a/pom.xml
+++ b/pom.xml
@@ -209,6 +209,7 @@
                     <configuration>
                         <javaVersion>17</javaVersion>
                         <failOnViolations>false</failOnViolations>
+                        <includeTestClasses>false</includeTestClasses>
                     </configuration>
                     <executions>
                         <execution>