diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3aeacb81b..97a089fc9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ kotlin = "2.3.21"
 ksp = "2.3.8"
 kotlinx-coroutines = "1.11.0"
 kotlinx-serialization = "1.11.0"
-kotlinx-datetime = "0.7.1"
+kotlinx-datetime = "0.8.0"
 
 kover = "0.9.8"
 agp = "9.2.1"
diff --git a/libs/datetime/src/main/kotlin/com/getcode/util/DateUtils.kt b/libs/datetime/src/main/kotlin/com/getcode/util/DateUtils.kt
index 35199d847..fd9c3eaf5 100644
--- a/libs/datetime/src/main/kotlin/com/getcode/util/DateUtils.kt
+++ b/libs/datetime/src/main/kotlin/com/getcode/util/DateUtils.kt
@@ -4,7 +4,7 @@ import android.text.format.DateFormat
 import android.text.format.DateUtils
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 import java.util.Calendar
 import java.util.Locale
 import kotlin.time.Clock
diff --git a/libs/datetime/src/test/kotlin/com/getcode/util/DateUtilsTest.kt b/libs/datetime/src/test/kotlin/com/getcode/util/DateUtilsTest.kt
index ca251999c..a7bee90f2 100644
--- a/libs/datetime/src/test/kotlin/com/getcode/util/DateUtilsTest.kt
+++ b/libs/datetime/src/test/kotlin/com/getcode/util/DateUtilsTest.kt
@@ -1,6 +1,6 @@
 package com.getcode.util
 
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
diff --git a/libs/datetime/src/test/kotlin/com/getcode/util/InstantExtensionsTest.kt b/libs/datetime/src/test/kotlin/com/getcode/util/InstantExtensionsTest.kt
index 739f34c2a..24f3a4397 100644
--- a/libs/datetime/src/test/kotlin/com/getcode/util/InstantExtensionsTest.kt
+++ b/libs/datetime/src/test/kotlin/com/getcode/util/InstantExtensionsTest.kt
@@ -1,8 +1,9 @@
 package com.getcode.util
 
 import kotlinx.datetime.DatePeriod
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 import kotlinx.datetime.LocalDate
+import kotlinx.datetime.Month
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.atStartOfDayIn
 import kotlinx.datetime.plus
@@ -27,8 +28,8 @@ class InstantExtensionsTest {
         val instant = Instant.fromEpochMilliseconds(1710504000000L)
         val date = instant.toLocalDate(utc)
         assertEquals(2024, date.year)
-        assertEquals(3, date.monthNumber)
-        assertEquals(15, date.dayOfMonth)
+        assertEquals(Month.MARCH, date.month)
+        assertEquals(15, date.day)
     }
 
     @Test
@@ -37,8 +38,8 @@ class InstantExtensionsTest {
         val instant = Instant.fromEpochMilliseconds(1704067200000L)
         val date = instant.toLocalDate(utc)
         assertEquals(2024, date.year)
-        assertEquals(1, date.monthNumber)
-        assertEquals(1, date.dayOfMonth)
+        assertEquals(Month.JANUARY, date.month)
+        assertEquals(1, date.day)
     }
 
     @Test
@@ -47,8 +48,8 @@ class InstantExtensionsTest {
         val instant = Instant.fromEpochMilliseconds(1704153599000L)
         val date = instant.toLocalDate(utc)
         assertEquals(2024, date.year)
-        assertEquals(1, date.monthNumber)
-        assertEquals(1, date.dayOfMonth)
+        assertEquals(Month.JANUARY, date.month)
+        assertEquals(1, date.day)
     }
 
     // --- atStartOfDay ---
diff --git a/libs/network/coinbase/onramp/src/main/kotlin/com/coinbase/onramp/data/OnRampPurchaseResponse.kt b/libs/network/coinbase/onramp/src/main/kotlin/com/coinbase/onramp/data/OnRampPurchaseResponse.kt
index 18ed242d7..e34be49f7 100644
--- a/libs/network/coinbase/onramp/src/main/kotlin/com/coinbase/onramp/data/OnRampPurchaseResponse.kt
+++ b/libs/network/coinbase/onramp/src/main/kotlin/com/coinbase/onramp/data/OnRampPurchaseResponse.kt
@@ -1,7 +1,7 @@
 package com.coinbase.onramp.data
 
 import com.getcode.serialization.InstantIso8601Serializer
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 import kotlinx.serialization.Serializable
 
 
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/internal/domain/ActivityFeedMessageMapper.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/internal/domain/ActivityFeedMessageMapper.kt
index 57bb009a6..36022befd 100644
--- a/services/flipcash/src/main/kotlin/com/flipcash/services/internal/domain/ActivityFeedMessageMapper.kt
+++ b/services/flipcash/src/main/kotlin/com/flipcash/services/internal/domain/ActivityFeedMessageMapper.kt
@@ -17,7 +17,7 @@ import com.getcode.opencode.model.financial.Fiat
 import com.getcode.opencode.model.financial.LocalFiat
 import com.getcode.opencode.model.financial.Rate
 import com.getcode.solana.keys.Mint
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 import java.math.BigDecimal
 import javax.inject.Inject
 
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/internal/extensions/Instant.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/internal/extensions/Instant.kt
index 01077bd7e..ae2784701 100644
--- a/services/flipcash/src/main/kotlin/com/flipcash/services/internal/extensions/Instant.kt
+++ b/services/flipcash/src/main/kotlin/com/flipcash/services/internal/extensions/Instant.kt
@@ -1,7 +1,7 @@
 package com.flipcash.services.internal.extensions
 
 import com.getcode.util.atStartOfDay
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
 
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/models/ActivityFeedNotification.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/models/ActivityFeedNotification.kt
index abe61ff90..fc72a860b 100644
--- a/services/flipcash/src/main/kotlin/com/flipcash/services/models/ActivityFeedNotification.kt
+++ b/services/flipcash/src/main/kotlin/com/flipcash/services/models/ActivityFeedNotification.kt
@@ -3,7 +3,7 @@ package com.flipcash.services.models
 import com.getcode.opencode.model.core.ID
 import com.getcode.opencode.model.financial.LocalFiat
 import com.getcode.solana.keys.PublicKey
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 import kotlinx.serialization.Serializable
 
 /**
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/domain/repositories/InternalTransactionRepository.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/domain/repositories/InternalTransactionRepository.kt
index 3217a2282..aead054cf 100644
--- a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/domain/repositories/InternalTransactionRepository.kt
+++ b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/domain/repositories/InternalTransactionRepository.kt
@@ -21,7 +21,7 @@ import com.getcode.solana.keys.PublicKey
 import com.getcode.utils.ErrorUtils
 import com.getcode.utils.network.retryableOrThrow
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 import kotlin.time.Duration.Companion.seconds
 import javax.inject.Inject
 
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/extensions/Instant.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/extensions/Instant.kt
index d50977670..f2b7c1eac 100644
--- a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/extensions/Instant.kt
+++ b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/extensions/Instant.kt
@@ -1,7 +1,7 @@
 package com.getcode.opencode.internal.extensions
 
 import com.getcode.util.atStartOfDay
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
 
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/services/TransactionService.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/services/TransactionService.kt
index ccbebacde..02f1e9da6 100644
--- a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/services/TransactionService.kt
+++ b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/services/TransactionService.kt
@@ -39,7 +39,7 @@ import com.getcode.solana.keys.PublicKey
 import com.getcode.solana.keys.base58
 import com.getcode.utils.trace
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 import javax.inject.Inject
 
 
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/model/financial/Limits.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/model/financial/Limits.kt
index d9611e294..82cfc906f 100644
--- a/services/opencode/src/main/kotlin/com/getcode/opencode/model/financial/Limits.kt
+++ b/services/opencode/src/main/kotlin/com/getcode/opencode/model/financial/Limits.kt
@@ -1,7 +1,7 @@
 package com.getcode.opencode.model.financial
 
 import com.codeinc.opencode.gen.transaction.v1.TransactionService
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 import kotlin.time.Duration.Companion.hours
 
 data class Limits(
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/repositories/TransactionRepository.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/repositories/TransactionRepository.kt
index a7136a141..9b2b74605 100644
--- a/services/opencode/src/main/kotlin/com/getcode/opencode/repositories/TransactionRepository.kt
+++ b/services/opencode/src/main/kotlin/com/getcode/opencode/repositories/TransactionRepository.kt
@@ -15,7 +15,7 @@ import com.getcode.opencode.solana.intents.IntentType
 import com.getcode.solana.keys.Mint
 import com.getcode.solana.keys.PublicKey
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 
 interface TransactionRepository {