diff --git a/commafeed-server/docker-compose.dev.yml b/commafeed-server/docker-compose.dev.yml
index d96e3d42..6aa7ff21 100644
--- a/commafeed-server/docker-compose.dev.yml
+++ b/commafeed-server/docker-compose.dev.yml
@@ -12,8 +12,8 @@ services:
   postgresql:
     image: postgres
     environment:
-      POSTGRES_USER: root
-      POSTGRES_PASSWORD: root
-      POSTGRES_DB: commafeed
+      - POSTGRES_USER=root
+      - POSTGRES_PASSWORD=root
+      - POSTGRES_DB=commafeed
     ports:
       - 5432:5432
diff --git a/commafeed-server/src/main/resources/changelogs/db.changelog-4.2.xml b/commafeed-server/src/main/resources/changelogs/db.changelog-4.2.xml
new file mode 100644
index 00000000..ecbada46
--- /dev/null
+++ b/commafeed-server/src/main/resources/changelogs/db.changelog-4.2.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+				   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+				   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+	<changeSet id="use-timestamps" author="athou">
+		<modifyDataType tableName="FEEDS" columnName="lastUpdated" newDataType="TIMESTAMP" />
+		<modifyDataType tableName="FEEDS" columnName="lastPublishedDate" newDataType="TIMESTAMP" />
+		<modifyDataType tableName="FEEDS" columnName="lastEntryDate" newDataType="TIMESTAMP" />
+		<modifyDataType tableName="FEEDS" columnName="disabledUntil" newDataType="TIMESTAMP" />
+		<modifyDataType tableName="FEEDENTRIES" columnName="inserted" newDataType="TIMESTAMP" />
+		<modifyDataType tableName="FEEDENTRIES" columnName="updated" newDataType="TIMESTAMP" />
+		<modifyDataType tableName="FEEDENTRYSTATUSES" columnName="entryInserted" newDataType="TIMESTAMP" />
+		<modifyDataType tableName="FEEDENTRYSTATUSES" columnName="entryUpdated" newDataType="TIMESTAMP" />
+		<modifyDataType tableName="USERS" columnName="lastLogin" newDataType="TIMESTAMP" />
+		<modifyDataType tableName="USERS" columnName="created" newDataType="TIMESTAMP" />
+		<modifyDataType tableName="USERS" columnName="recoverPasswordTokenDate" newDataType="TIMESTAMP" />
+		<modifySql dbms="postgresql">
+			<!-- liquibase uses the 'TIMESTAMP WITHOUT TIME ZONE' type by default, which is not a UTC timestamp -->
+			<!-- postgresql UTC timestamp is actually 'TIMESTAMP WITH TIME ZONE' -->
+			<!-- see https://stackoverflow.com/a/48069726/1885506 -->
+			<replace replace="WITHOUT TIME ZONE" with="WITH TIME ZONE" />
+		</modifySql>
+	</changeSet>
+
+</databaseChangeLog>
diff --git a/commafeed-server/src/main/resources/migrations.xml b/commafeed-server/src/main/resources/migrations.xml
index d6e54040..7c23aafa 100644
--- a/commafeed-server/src/main/resources/migrations.xml
+++ b/commafeed-server/src/main/resources/migrations.xml
@@ -24,5 +24,6 @@
 	<include file="changelogs/db.changelog-3.9.xml" />
 	<include file="changelogs/db.changelog-4.0.xml" />
 	<include file="changelogs/db.changelog-4.1.xml" />
+	<include file="changelogs/db.changelog-4.2.xml" />
 
 </databaseChangeLog> 
\ No newline at end of file