From 2d1ca986053590eff34a9d8519e0d33fc9615192 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Wed, 8 Dec 2021 17:32:19 -0500
Subject: [PATCH] Consolidate DynamoDB clients/configuration

---
 abusive-message-filter                        |   2 +-
 service/config/sample.yml                     |  84 +++++------
 .../WhisperServerConfiguration.java           | 103 --------------
 .../textsecuregcm/WhisperServerService.java   |  93 ++++--------
 .../AccountsDynamoDbConfiguration.java        |  38 -----
 .../AccountsTableConfiguration.java           |  49 +++++++
 .../DeletedAccountsDynamoDbConfiguration.java |  13 --
 .../DeletedAccountsTableConfiguration.java    |  25 ++++
 .../configuration/DynamoDbConfiguration.java  |  44 ------
 .../configuration/DynamoDbTables.java         | 133 +++++++++++++++---
 .../MessageDynamoDbConfiguration.java         |  19 ---
 .../util/DynamoDbFromConfig.java              |  12 --
 .../workers/AssignUsernameCommand.java        |  94 +++++--------
 .../workers/DeleteUserCommand.java            |  78 ++++------
 .../workers/ReserveUsernameCommand.java       |   6 +-
 .../SetUserDiscoverabilityCommand.java        |  76 ++++------
 16 files changed, 340 insertions(+), 529 deletions(-)
 delete mode 100644 service/src/main/java/org/whispersystems/textsecuregcm/configuration/AccountsDynamoDbConfiguration.java
 create mode 100644 service/src/main/java/org/whispersystems/textsecuregcm/configuration/AccountsTableConfiguration.java
 delete mode 100644 service/src/main/java/org/whispersystems/textsecuregcm/configuration/DeletedAccountsDynamoDbConfiguration.java
 create mode 100644 service/src/main/java/org/whispersystems/textsecuregcm/configuration/DeletedAccountsTableConfiguration.java
 delete mode 100644 service/src/main/java/org/whispersystems/textsecuregcm/configuration/DynamoDbConfiguration.java
 delete mode 100644 service/src/main/java/org/whispersystems/textsecuregcm/configuration/MessageDynamoDbConfiguration.java

diff --git a/abusive-message-filter b/abusive-message-filter
index 82b7b374c..e24dabb53 160000
--- a/abusive-message-filter
+++ b/abusive-message-filter
@@ -1 +1 @@
-Subproject commit 82b7b374c57cf993f9a188d7a5ee7e7be83beb36
+Subproject commit e24dabb53940738bdbf67b9b7ac74d39fe876a58
diff --git a/service/config/sample.yml b/service/config/sample.yml
index 88c2d1060..1a2e55a36 100644
--- a/service/config/sample.yml
+++ b/service/config/sample.yml
@@ -13,19 +13,47 @@ dynamoDbClientConfiguration:
   region: us-west-2 # AWS Region
 
 dynamoDbTables:
+  accounts:
+    tableName: Example_Accounts
+    phoneNumberTableName: Example_Accounts_PhoneNumbers
+    phoneNumberIdentifierTableName: Example_Accounts_PhoneNumberIdentifiers
+    usernamesTableName: Example_Accounts_Usernames
+    scanPageSize: 100
+  deletedAccounts:
+    tableName: Example_DeletedAccounts
+    needsReconciliationIndexName: NeedsReconciliation
+  deletedAccountsLock:
+    tableName: Example_DeletedAccountsLock
   issuedReceipts:
     tableName: Example_IssuedReceipts
     expiration: P30D # Duration of time until rows expire
     generator: abcdefg12345678= # random base64-encoded binary sequence
+  keys:
+    tableName: Example_Keys
+  messages:
+    tableName: Example_Messages
+    expiration: P30D # Duration of time until rows expire
+  pendingAccounts:
+    tableName: Example_PendingAccounts
+  pendingDevices:
+    tableName: Example_PendingDevices
+  phoneNumberIdentifiers:
+    tableName: Example_PhoneNumberIdentifiers
+  profiles:
+    tableName: Example_Profiles
+  pushChallenge:
+    tableName: Example_PushChallenge
   redeemedReceipts:
     tableName: Example_RedeemedReceipts
     expiration: P30D # Duration of time until rows expire
-  subscriptions:
-    tableName: Example_Subscriptions
-  profiles:
-    tableName: Example_Profiles
   remoteConfig:
     tableName: Example_RemoteConfig
+  reportMessage:
+    tableName: Example_ReportMessage
+  reservedUsernames:
+    tableName: Example_ReservedUsernames
+  subscriptions:
+    tableName: Example_Subscriptions
 
 twilio: # Twilio gateway configuration
   accountId: unset
@@ -126,54 +154,6 @@ messageCache: # Redis server configuration for message store cache
 metricsCluster:
   configurationUri: redis://redis.example.com:6379/
 
-messageDynamoDb: # DynamoDB table configuration
-  region: us-west-2
-  tableName: Example_Messages
-
-keysDynamoDb: # DynamoDB table configuration
-  region: us-west-2
-  tableName: Example_PreKeys
-
-accountsDynamoDb: # DynamoDB table configuration
-  region: us-west-2
-  tableName: Example_Accounts
-  phoneNumberTableName: Example_Accounts_PhoneNumbers
-  phoneNumberIdentifierTableName: Example_Accounts_PhoneNumberIdentifiers
-  usernamesTableName: Example_Accounts_Usernames
-
-deletedAccountsDynamoDb: # DynamoDb table configuration
-  region: us-west-2
-  tableName: Example_DeletedAccounts
-  needsReconciliationIndexName: NeedsReconciliation
-
-deletedAccountsLockDynamoDb: # DynamoDb table configuration
-  region: us-west-2
-  tableName: Example_DeletedAccountsLock
-
-pendingAccountsDynamoDb: # DynamoDB table configuration
-  region: us-west-2
-  tableName: Example_PendingAccounts
-
-pendingDevicesDynamoDb: # DynamoDB table configuration
-  region: us-west-2
-  tableName: Example_PendingDevices
-
-reservedUsernamesDynamoDb: # DynamoDB table configuration
-  region: us-west-2
-  tableName: Example_ReservedUsernames
-
-phoneNumberIdentifiersDynamoDb: # DynamoDB table configuration
-  region: us-west-2
-  tableName: Example_PhoneNumberIdentifiers
-
-pushChallengeDynamoDb: # DynamoDB table configuration
-  region: us-west-2
-  tableName: Example_PushChallenges
-
-reportMessageDynamoDb: # DynamoDB table configuration
-  region: us-west-2
-  tableName: Example_ReportedMessages
-
 awsAttachments: # AWS S3 configuration
   accessKey: test
   accessSecret: test
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
index f60b92628..70897c446 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
@@ -15,7 +15,6 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import org.whispersystems.textsecuregcm.configuration.AbusiveMessageFilterConfiguration;
 import org.whispersystems.textsecuregcm.configuration.AccountDatabaseCrawlerConfiguration;
-import org.whispersystems.textsecuregcm.configuration.AccountsDynamoDbConfiguration;
 import org.whispersystems.textsecuregcm.configuration.ApnConfiguration;
 import org.whispersystems.textsecuregcm.configuration.AppConfigConfiguration;
 import org.whispersystems.textsecuregcm.configuration.AwsAttachmentsConfiguration;
@@ -24,18 +23,15 @@ import org.whispersystems.textsecuregcm.configuration.BoostConfiguration;
 import org.whispersystems.textsecuregcm.configuration.CdnConfiguration;
 import org.whispersystems.textsecuregcm.configuration.DatabaseConfiguration;
 import org.whispersystems.textsecuregcm.configuration.DatadogConfiguration;
-import org.whispersystems.textsecuregcm.configuration.DeletedAccountsDynamoDbConfiguration;
 import org.whispersystems.textsecuregcm.configuration.DirectoryConfiguration;
 import org.whispersystems.textsecuregcm.configuration.DirectoryV2Configuration;
 import org.whispersystems.textsecuregcm.configuration.DonationConfiguration;
 import org.whispersystems.textsecuregcm.configuration.DynamoDbClientConfiguration;
-import org.whispersystems.textsecuregcm.configuration.DynamoDbConfiguration;
 import org.whispersystems.textsecuregcm.configuration.DynamoDbTables;
 import org.whispersystems.textsecuregcm.configuration.GcmConfiguration;
 import org.whispersystems.textsecuregcm.configuration.GcpAttachmentsConfiguration;
 import org.whispersystems.textsecuregcm.configuration.MaxDeviceConfiguration;
 import org.whispersystems.textsecuregcm.configuration.MessageCacheConfiguration;
-import org.whispersystems.textsecuregcm.configuration.MessageDynamoDbConfiguration;
 import org.whispersystems.textsecuregcm.configuration.PaymentsServiceConfiguration;
 import org.whispersystems.textsecuregcm.configuration.PushConfiguration;
 import org.whispersystems.textsecuregcm.configuration.RateLimitsConfiguration;
@@ -155,61 +151,6 @@ public class WhisperServerConfiguration extends Configuration {
   @JsonProperty
   private RedisClusterConfiguration clientPresenceCluster;
 
-  @Valid
-  @NotNull
-  @JsonProperty
-  private MessageDynamoDbConfiguration messageDynamoDb;
-
-  @Valid
-  @NotNull
-  @JsonProperty
-  private DynamoDbConfiguration keysDynamoDb;
-
-  @Valid
-  @NotNull
-  @JsonProperty
-  private AccountsDynamoDbConfiguration accountsDynamoDb;
-
-  @Valid
-  @NotNull
-  @JsonProperty
-  private DynamoDbConfiguration phoneNumberIdentifiersDynamoDb;
-
-  @Valid
-  @NotNull
-  @JsonProperty
-  private DeletedAccountsDynamoDbConfiguration deletedAccountsDynamoDb;
-
-  @Valid
-  @NotNull
-  @JsonProperty
-  private DynamoDbConfiguration deletedAccountsLockDynamoDb;
-
-  @Valid
-  @NotNull
-  @JsonProperty
-  private DynamoDbConfiguration pushChallengeDynamoDb;
-
-  @Valid
-  @NotNull
-  @JsonProperty
-  private DynamoDbConfiguration reportMessageDynamoDb;
-
-  @Valid
-  @NotNull
-  @JsonProperty
-  private DynamoDbConfiguration pendingAccountsDynamoDb;
-
-  @Valid
-  @NotNull
-  @JsonProperty
-  private DynamoDbConfiguration pendingDevicesDynamoDb;
-
-  @Valid
-  @NotNull
-  @JsonProperty
-  private DynamoDbConfiguration reservedUsernamesDynamoDb;
-
   @Valid
   @NotNull
   @JsonProperty
@@ -428,30 +369,6 @@ public class WhisperServerConfiguration extends Configuration {
     return rateLimitersCluster;
   }
 
-  public MessageDynamoDbConfiguration getMessageDynamoDbConfiguration() {
-    return messageDynamoDb;
-  }
-
-  public DynamoDbConfiguration getKeysDynamoDbConfiguration() {
-    return keysDynamoDb;
-  }
-
-  public AccountsDynamoDbConfiguration getAccountsDynamoDbConfiguration() {
-    return accountsDynamoDb;
-  }
-
-  public DynamoDbConfiguration getPhoneNumberIdentifiersDynamoDbConfiguration() {
-    return phoneNumberIdentifiersDynamoDb;
-  }
-
-  public DeletedAccountsDynamoDbConfiguration getDeletedAccountsDynamoDbConfiguration() {
-    return deletedAccountsDynamoDb;
-  }
-
-  public DynamoDbConfiguration getDeletedAccountsLockDynamoDbConfiguration() {
-    return deletedAccountsLockDynamoDb;
-  }
-
   public DatabaseConfiguration getAbuseDatabaseConfiguration() {
     return abuseDatabase;
   }
@@ -530,26 +447,6 @@ public class WhisperServerConfiguration extends Configuration {
     return appConfig;
   }
 
-  public DynamoDbConfiguration getPushChallengeDynamoDbConfiguration() {
-    return pushChallengeDynamoDb;
-  }
-
-  public DynamoDbConfiguration getReportMessageDynamoDbConfiguration() {
-    return reportMessageDynamoDb;
-  }
-
-  public DynamoDbConfiguration getPendingAccountsDynamoDbConfiguration() {
-    return pendingAccountsDynamoDb;
-  }
-
-  public DynamoDbConfiguration getPendingDevicesDynamoDbConfiguration() {
-    return pendingDevicesDynamoDb;
-  }
-
-  public DynamoDbConfiguration getReservedUsernamesDynamoDbConfiguration() {
-    return reservedUsernamesDynamoDb;
-  }
-
   public DonationConfiguration getDonationConfiguration() {
     return donation;
   }
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index dabc4c373..017ef9415 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -320,53 +320,18 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
         config.getDynamoDbClientConfiguration(),
         software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
 
-    DynamoDbClient messageDynamoDb = DynamoDbFromConfig.client(config.getMessageDynamoDbConfiguration(),
-        software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-
-    DynamoDbClient preKeyDynamoDb = DynamoDbFromConfig.client(config.getKeysDynamoDbConfiguration(),
-        software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-
-    DynamoDbClient accountsDynamoDbClient = DynamoDbFromConfig.client(config.getAccountsDynamoDbConfiguration(),
-        software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-
-    DynamoDbClient reservedUsernamesDynamoDbClient = DynamoDbFromConfig.client(config.getReservedUsernamesDynamoDbConfiguration(),
-        software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-
-    DynamoDbClient phoneNumberIdentifiersDynamoDbClient =
-        DynamoDbFromConfig.client(config.getPhoneNumberIdentifiersDynamoDbConfiguration(),
-            software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-
-    DynamoDbClient deletedAccountsDynamoDbClient = DynamoDbFromConfig.client(config.getDeletedAccountsDynamoDbConfiguration(),
-        software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-
-    DynamoDbClient pushChallengeDynamoDbClient = DynamoDbFromConfig.client(
-        config.getPushChallengeDynamoDbConfiguration(),
-        software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-
-    DynamoDbClient reportMessageDynamoDbClient = DynamoDbFromConfig.client(
-        config.getReportMessageDynamoDbConfiguration(),
-        software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-
-    DynamoDbClient pendingAccountsDynamoDbClient = DynamoDbFromConfig.client(
-        config.getPendingAccountsDynamoDbConfiguration(),
-        software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-
-    DynamoDbClient pendingDevicesDynamoDbClient = DynamoDbFromConfig.client(
-        config.getPendingDevicesDynamoDbConfiguration(),
-        software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-
     AmazonDynamoDB deletedAccountsLockDynamoDbClient = AmazonDynamoDBClientBuilder.standard()
-        .withRegion(config.getDeletedAccountsLockDynamoDbConfiguration().getRegion())
+        .withRegion(config.getDynamoDbClientConfiguration().getRegion())
         .withClientConfiguration(new ClientConfiguration().withClientExecutionTimeout(
-                ((int) config.getDeletedAccountsLockDynamoDbConfiguration().getClientExecutionTimeout().toMillis()))
+                ((int) config.getDynamoDbClientConfiguration().getClientExecutionTimeout().toMillis()))
             .withRequestTimeout(
-                (int) config.getDeletedAccountsLockDynamoDbConfiguration().getClientRequestTimeout().toMillis()))
+                (int) config.getDynamoDbClientConfiguration().getClientRequestTimeout().toMillis()))
         .withCredentials(InstanceProfileCredentialsProvider.getInstance())
         .build();
 
-    DeletedAccounts deletedAccounts = new DeletedAccounts(deletedAccountsDynamoDbClient,
-        config.getDeletedAccountsDynamoDbConfiguration().getTableName(),
-        config.getDeletedAccountsDynamoDbConfiguration().getNeedsReconciliationIndexName());
+    DeletedAccounts deletedAccounts = new DeletedAccounts(dynamoDbClient,
+        config.getDynamoDbTables().getDeletedAccounts().getTableName(),
+        config.getDynamoDbTables().getDeletedAccounts().getNeedsReconciliationIndexName());
 
     DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager =
         new DynamicConfigurationManager<>(config.getAppConfig().getApplication(),
@@ -374,34 +339,34 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
             config.getAppConfig().getConfigurationName(),
             DynamicConfiguration.class);
 
-    Accounts accounts = new Accounts(accountsDynamoDbClient,
-        config.getAccountsDynamoDbConfiguration().getTableName(),
-        config.getAccountsDynamoDbConfiguration().getPhoneNumberTableName(),
-        config.getAccountsDynamoDbConfiguration().getPhoneNumberIdentifierTableName(),
-        config.getAccountsDynamoDbConfiguration().getUsernamesTableName(),
-        config.getAccountsDynamoDbConfiguration().getScanPageSize());
-    PhoneNumberIdentifiers phoneNumberIdentifiers = new PhoneNumberIdentifiers(phoneNumberIdentifiersDynamoDbClient,
-        config.getPhoneNumberIdentifiersDynamoDbConfiguration().getTableName());
-    ReservedUsernames reservedUsernames = new ReservedUsernames(reservedUsernamesDynamoDbClient,
-        config.getReservedUsernamesDynamoDbConfiguration().getTableName());
+    Accounts accounts = new Accounts(dynamoDbClient,
+        config.getDynamoDbTables().getAccounts().getTableName(),
+        config.getDynamoDbTables().getAccounts().getPhoneNumberTableName(),
+        config.getDynamoDbTables().getAccounts().getPhoneNumberIdentifierTableName(),
+        config.getDynamoDbTables().getAccounts().getUsernamesTableName(),
+        config.getDynamoDbTables().getAccounts().getScanPageSize());
+    PhoneNumberIdentifiers phoneNumberIdentifiers = new PhoneNumberIdentifiers(dynamoDbClient,
+        config.getDynamoDbTables().getPhoneNumberIdentifiers().getTableName());
+    ReservedUsernames reservedUsernames = new ReservedUsernames(dynamoDbClient,
+        config.getDynamoDbTables().getReservedUsernames().getTableName());
     Profiles profiles = new Profiles(dynamoDbClient, dynamoDbAsyncClient,
         config.getDynamoDbTables().getProfiles().getTableName());
-    Keys keys = new Keys(preKeyDynamoDb, config.getKeysDynamoDbConfiguration().getTableName());
-    MessagesDynamoDb messagesDynamoDb = new MessagesDynamoDb(messageDynamoDb,
-        config.getMessageDynamoDbConfiguration().getTableName(),
-        config.getMessageDynamoDbConfiguration().getTimeToLive());
+    Keys keys = new Keys(dynamoDbClient, config.getDynamoDbTables().getKeys().getTableName());
+    MessagesDynamoDb messagesDynamoDb = new MessagesDynamoDb(dynamoDbClient,
+        config.getDynamoDbTables().getMessages().getTableName(),
+        config.getDynamoDbTables().getMessages().getExpiration());
     AbusiveHostRules abusiveHostRules = new AbusiveHostRules(abuseDatabase);
     RemoteConfigs remoteConfigs = new RemoteConfigs(dynamoDbClient,
         config.getDynamoDbTables().getRemoteConfig().getTableName());
-    PushChallengeDynamoDb pushChallengeDynamoDb = new PushChallengeDynamoDb(pushChallengeDynamoDbClient,
-        config.getPushChallengeDynamoDbConfiguration().getTableName());
-    ReportMessageDynamoDb reportMessageDynamoDb = new ReportMessageDynamoDb(reportMessageDynamoDbClient,
-        config.getReportMessageDynamoDbConfiguration().getTableName(),
+    PushChallengeDynamoDb pushChallengeDynamoDb = new PushChallengeDynamoDb(dynamoDbClient,
+        config.getDynamoDbTables().getPushChallenge().getTableName());
+    ReportMessageDynamoDb reportMessageDynamoDb = new ReportMessageDynamoDb(dynamoDbClient,
+        config.getDynamoDbTables().getReportMessage().getTableName(),
         config.getReportMessageConfiguration().getReportTtl());
-    VerificationCodeStore pendingAccounts = new VerificationCodeStore(pendingAccountsDynamoDbClient,
-        config.getPendingAccountsDynamoDbConfiguration().getTableName());
-    VerificationCodeStore pendingDevices = new VerificationCodeStore(pendingDevicesDynamoDbClient,
-        config.getPendingDevicesDynamoDbConfiguration().getTableName());
+    VerificationCodeStore pendingAccounts = new VerificationCodeStore(dynamoDbClient,
+        config.getDynamoDbTables().getPendingAccounts().getTableName());
+    VerificationCodeStore pendingDevices = new VerificationCodeStore(dynamoDbClient,
+        config.getDynamoDbTables().getPendingDevices().getTableName());
 
     RedisClientFactory  pubSubClientFactory = new RedisClientFactory("pubsub_cache", config.getPubsubCacheConfiguration().getUrl(), config.getPubsubCacheConfiguration().getReplicaUrls(), config.getPubsubCacheConfiguration().getCircuitBreakerConfiguration());
     ReplicatedJedisPool pubsubClient        = pubSubClientFactory.getRedisClientPool();
@@ -471,7 +436,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     ReportMessageManager       reportMessageManager       = new ReportMessageManager(reportMessageDynamoDb, rateLimitersCluster, Metrics.globalRegistry, config.getReportMessageConfiguration().getCounterTtl());
     MessagesManager            messagesManager            = new MessagesManager(messagesDynamoDb, messagesCache, pushLatencyManager, reportMessageManager);
     DeletedAccountsManager deletedAccountsManager = new DeletedAccountsManager(deletedAccounts,
-        deletedAccountsLockDynamoDbClient, config.getDeletedAccountsLockDynamoDbConfiguration().getTableName());
+        deletedAccountsLockDynamoDbClient, config.getDynamoDbTables().getDeletedAccounts().getTableName());
     AccountsManager accountsManager = new AccountsManager(accounts, phoneNumberIdentifiers, cacheCluster,
         deletedAccountsManager, directoryQueue, keys, messagesManager, reservedUsernames, profilesManager,
         pendingAccountsManager, secureStorageClient, secureBackupClient, clientPresenceManager, clock);
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/AccountsDynamoDbConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/AccountsDynamoDbConfiguration.java
deleted file mode 100644
index 2871d786f..000000000
--- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/AccountsDynamoDbConfiguration.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.whispersystems.textsecuregcm.configuration;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import javax.validation.constraints.NotNull;
-
-public class AccountsDynamoDbConfiguration extends DynamoDbConfiguration {
-
-  @NotNull
-  private String phoneNumberTableName;
-
-  @NotNull
-  private String phoneNumberIdentifierTableName;
-
-  @NotNull
-  private String usernamesTableName;
-
-  private int scanPageSize = 100;
-
-  @JsonProperty
-  public String getPhoneNumberTableName() {
-    return phoneNumberTableName;
-  }
-
-  @JsonProperty
-  public String getPhoneNumberIdentifierTableName() {
-    return phoneNumberIdentifierTableName;
-  }
-
-  @JsonProperty
-  public String getUsernamesTableName() {
-    return usernamesTableName;
-  }
-
-  @JsonProperty
-  public int getScanPageSize() {
-    return scanPageSize;
-  }
-}
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/AccountsTableConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/AccountsTableConfiguration.java
new file mode 100644
index 000000000..21eee6c8d
--- /dev/null
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/AccountsTableConfiguration.java
@@ -0,0 +1,49 @@
+package org.whispersystems.textsecuregcm.configuration;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.whispersystems.textsecuregcm.configuration.DynamoDbTables.Table;
+import javax.validation.constraints.NotBlank;
+
+public class AccountsTableConfiguration extends Table {
+
+  private final String phoneNumberTableName;
+  private final String phoneNumberIdentifierTableName;
+  private final String usernamesTableName;
+  private final int scanPageSize;
+
+  @JsonCreator
+  public AccountsTableConfiguration(
+      @JsonProperty("tableName") final String tableName,
+      @JsonProperty("phoneNumberTableName") final String phoneNumberTableName,
+      @JsonProperty("phoneNumberIdentifierTableName") final String phoneNumberIdentifierTableName,
+      @JsonProperty("usernamesTableName") final String usernamesTableName,
+      @JsonProperty("scanPageSize") final int scanPageSize) {
+
+    super(tableName);
+
+    this.phoneNumberTableName = phoneNumberTableName;
+    this.phoneNumberIdentifierTableName = phoneNumberIdentifierTableName;
+    this.usernamesTableName = usernamesTableName;
+    this.scanPageSize = scanPageSize;
+  }
+
+  @NotBlank
+  public String getPhoneNumberTableName() {
+    return phoneNumberTableName;
+  }
+
+  @NotBlank
+  public String getPhoneNumberIdentifierTableName() {
+    return phoneNumberIdentifierTableName;
+  }
+
+  @NotBlank
+  public String getUsernamesTableName() {
+    return usernamesTableName;
+  }
+
+  public int getScanPageSize() {
+    return scanPageSize;
+  }
+}
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DeletedAccountsDynamoDbConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DeletedAccountsDynamoDbConfiguration.java
deleted file mode 100644
index 5a125fd13..000000000
--- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DeletedAccountsDynamoDbConfiguration.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.whispersystems.textsecuregcm.configuration;
-
-import javax.validation.constraints.NotNull;
-
-public class DeletedAccountsDynamoDbConfiguration extends DynamoDbConfiguration {
-
-  @NotNull
-  private String needsReconciliationIndexName;
-
-  public String getNeedsReconciliationIndexName() {
-    return needsReconciliationIndexName;
-  }
-}
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DeletedAccountsTableConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DeletedAccountsTableConfiguration.java
new file mode 100644
index 000000000..88d621aec
--- /dev/null
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DeletedAccountsTableConfiguration.java
@@ -0,0 +1,25 @@
+package org.whispersystems.textsecuregcm.configuration;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.validation.constraints.NotBlank;
+import org.whispersystems.textsecuregcm.configuration.DynamoDbTables.Table;
+
+public class DeletedAccountsTableConfiguration extends Table {
+
+  private final String needsReconciliationIndexName;
+
+  @JsonCreator
+  public DeletedAccountsTableConfiguration(
+      @JsonProperty("tableName") final String tableName,
+      @JsonProperty("needsReconciliationIndexName") final String needsReconciliationIndexName) {
+
+    super(tableName);
+    this.needsReconciliationIndexName = needsReconciliationIndexName;
+  }
+
+  @NotBlank
+  public String getNeedsReconciliationIndexName() {
+    return needsReconciliationIndexName;
+  }
+}
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DynamoDbConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DynamoDbConfiguration.java
deleted file mode 100644
index 1d50aecaf..000000000
--- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DynamoDbConfiguration.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2021 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.configuration;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import java.time.Duration;
-
-public class DynamoDbConfiguration {
-
-    private String   region;
-    private String   tableName;
-    private Duration clientExecutionTimeout = Duration.ofSeconds(30);
-    private Duration clientRequestTimeout   = Duration.ofSeconds(10);
-
-    @Valid
-    @NotEmpty
-    @JsonProperty
-    public String getRegion() {
-        return region;
-    }
-
-    @Valid
-    @NotEmpty
-    @JsonProperty
-    public String getTableName() {
-        return tableName;
-    }
-
-    @JsonProperty
-    public Duration getClientExecutionTimeout() {
-        return clientExecutionTimeout;
-    }
-
-    @JsonProperty
-    public Duration getClientRequestTimeout() {
-        return clientRequestTimeout;
-    }
-}
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DynamoDbTables.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DynamoDbTables.java
index ada22eb87..ef6514925 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DynamoDbTables.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DynamoDbTables.java
@@ -46,53 +46,152 @@ public class DynamoDbTables {
     }
   }
 
+  private final AccountsTableConfiguration accounts;
+  private final DeletedAccountsTableConfiguration deletedAccounts;
+  private final Table deletedAccountsLock;
   private final IssuedReceiptsTableConfiguration issuedReceipts;
-  private final TableWithExpiration redeemedReceipts;
-  private final Table subscriptions;
+  private final Table keys;
+  private final TableWithExpiration messages;
+  private final Table pendingAccounts;
+  private final Table pendingDevices;
+  private final Table phoneNumberIdentifiers;
   private final Table profiles;
+  private final Table pushChallenge;
+  private final TableWithExpiration redeemedReceipts;
   private final Table remoteConfig;
+  private final Table reportMessage;
+  private final Table reservedUsernames;
+  private final Table subscriptions;
 
-  @JsonCreator
   public DynamoDbTables(
+      @JsonProperty("accounts") final AccountsTableConfiguration accounts,
+      @JsonProperty("deletedAccounts") final DeletedAccountsTableConfiguration deletedAccounts,
+      @JsonProperty("deletedAccountsLock") final Table deletedAccountsLock,
       @JsonProperty("issuedReceipts") final IssuedReceiptsTableConfiguration issuedReceipts,
-      @JsonProperty("redeemedReceipts") final TableWithExpiration redeemedReceipts,
-      @JsonProperty("subscriptions") final Table subscriptions,
+      @JsonProperty("keys") final Table keys,
+      @JsonProperty("messages") final TableWithExpiration messages,
+      @JsonProperty("pendingAccounts") final Table pendingAccounts,
+      @JsonProperty("pendingDevices") final Table pendingDevices,
+      @JsonProperty("phoneNumberIdentifiers") final Table phoneNumberIdentifiers,
       @JsonProperty("profiles") final Table profiles,
-      @JsonProperty("remoteConfig") final Table remoteConfig) {
+      @JsonProperty("pushChallenge") final Table pushChallenge,
+      @JsonProperty("redeemedReceipts") final TableWithExpiration redeemedReceipts,
+      @JsonProperty("remoteConfig") final Table remoteConfig,
+      @JsonProperty("reportMessage") final Table reportMessage,
+      @JsonProperty("reservedUsernames") final Table reservedUsernames,
+      @JsonProperty("subscriptions") final Table subscriptions) {
+
+    this.accounts = accounts;
+    this.deletedAccounts = deletedAccounts;
+    this.deletedAccountsLock = deletedAccountsLock;
     this.issuedReceipts = issuedReceipts;
-    this.redeemedReceipts = redeemedReceipts;
-    this.subscriptions = subscriptions;
+    this.keys = keys;
+    this.messages = messages;
+    this.pendingAccounts = pendingAccounts;
+    this.pendingDevices = pendingDevices;
+    this.phoneNumberIdentifiers = phoneNumberIdentifiers;
     this.profiles = profiles;
+    this.pushChallenge = pushChallenge;
+    this.redeemedReceipts = redeemedReceipts;
     this.remoteConfig = remoteConfig;
+    this.reportMessage = reportMessage;
+    this.reservedUsernames = reservedUsernames;
+    this.subscriptions = subscriptions;
   }
 
-  @Valid
   @NotNull
+  @Valid
+  public AccountsTableConfiguration getAccounts() {
+    return accounts;
+  }
+
+  @NotNull
+  @Valid
+  public DeletedAccountsTableConfiguration getDeletedAccounts() {
+    return deletedAccounts;
+  }
+
+  @NotNull
+  @Valid
+  public Table getDeletedAccountsLock() {
+    return deletedAccountsLock;
+  }
+
+  @NotNull
+  @Valid
   public IssuedReceiptsTableConfiguration getIssuedReceipts() {
     return issuedReceipts;
   }
 
-  @Valid
   @NotNull
-  public TableWithExpiration getRedeemedReceipts() {
-    return redeemedReceipts;
+  @Valid
+  public Table getKeys() {
+    return keys;
   }
 
-  @Valid
   @NotNull
-  public Table getSubscriptions() {
-    return subscriptions;
+  @Valid
+  public TableWithExpiration getMessages() {
+    return messages;
   }
 
-  @Valid
   @NotNull
+  @Valid
+  public Table getPendingAccounts() {
+    return pendingAccounts;
+  }
+
+  @NotNull
+  @Valid
+  public Table getPendingDevices() {
+    return pendingDevices;
+  }
+
+  @NotNull
+  @Valid
+  public Table getPhoneNumberIdentifiers() {
+    return phoneNumberIdentifiers;
+  }
+
+  @NotNull
+  @Valid
   public Table getProfiles() {
     return profiles;
   }
 
-  @Valid
   @NotNull
+  @Valid
+  public Table getPushChallenge() {
+    return pushChallenge;
+  }
+
+  @NotNull
+  @Valid
+  public TableWithExpiration getRedeemedReceipts() {
+    return redeemedReceipts;
+  }
+
+  @NotNull
+  @Valid
   public Table getRemoteConfig() {
     return remoteConfig;
   }
+
+  @NotNull
+  @Valid
+  public Table getReportMessage() {
+    return reportMessage;
+  }
+
+  @NotNull
+  @Valid
+  public Table getReservedUsernames() {
+    return reservedUsernames;
+  }
+
+  @NotNull
+  @Valid
+  public Table getSubscriptions() {
+    return subscriptions;
+  }
 }
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/MessageDynamoDbConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/MessageDynamoDbConfiguration.java
deleted file mode 100644
index 19e507ffc..000000000
--- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/MessageDynamoDbConfiguration.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2021 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.configuration;
-
-import java.time.Duration;
-import javax.validation.Valid;
-
-public class MessageDynamoDbConfiguration extends DynamoDbConfiguration {
-
-  private Duration timeToLive = Duration.ofDays(14);
-
-  @Valid
-  public Duration getTimeToLive() {
-    return timeToLive;
-  }
-}
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/util/DynamoDbFromConfig.java b/service/src/main/java/org/whispersystems/textsecuregcm/util/DynamoDbFromConfig.java
index 1ab86997e..559baf3d2 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/util/DynamoDbFromConfig.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/util/DynamoDbFromConfig.java
@@ -1,7 +1,6 @@
 package org.whispersystems.textsecuregcm.util;
 
 import org.whispersystems.textsecuregcm.configuration.DynamoDbClientConfiguration;
-import org.whispersystems.textsecuregcm.configuration.DynamoDbConfiguration;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
 import software.amazon.awssdk.regions.Region;
@@ -10,17 +9,6 @@ import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
 
 public class DynamoDbFromConfig {
 
-  public static DynamoDbClient client(DynamoDbConfiguration config, AwsCredentialsProvider credentialsProvider) {
-    return DynamoDbClient.builder()
-        .region(Region.of(config.getRegion()))
-        .credentialsProvider(credentialsProvider)
-        .overrideConfiguration(ClientOverrideConfiguration.builder()
-            .apiCallTimeout(config.getClientExecutionTimeout())
-            .apiCallAttemptTimeout(config.getClientRequestTimeout())
-            .build())
-        .build();
-  }
-
   public static DynamoDbClient client(DynamoDbClientConfiguration config, AwsCredentialsProvider credentialsProvider) {
     return DynamoDbClient.builder()
         .region(Region.of(config.getRegion()))
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/workers/AssignUsernameCommand.java b/service/src/main/java/org/whispersystems/textsecuregcm/workers/AssignUsernameCommand.java
index 56ac6481e..8add5ffd1 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/workers/AssignUsernameCommand.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/workers/AssignUsernameCommand.java
@@ -5,6 +5,8 @@
 
 package org.whispersystems.textsecuregcm.workers;
 
+import static com.codahale.metrics.MetricRegistry.name;
+
 import com.amazonaws.ClientConfiguration;
 import com.amazonaws.auth.InstanceProfileCredentialsProvider;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
@@ -15,10 +17,12 @@ import io.dropwizard.cli.EnvironmentCommand;
 import io.dropwizard.setup.Environment;
 import io.lettuce.core.resource.ClientResources;
 import io.micrometer.core.instrument.Metrics;
+import java.time.Clock;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.whispersystems.textsecuregcm.WhisperServerConfiguration;
 import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentialGenerator;
 import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration;
@@ -28,10 +32,8 @@ import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisCluster;
 import org.whispersystems.textsecuregcm.securebackup.SecureBackupClient;
 import org.whispersystems.textsecuregcm.securestorage.SecureStorageClient;
 import org.whispersystems.textsecuregcm.sqs.DirectoryQueue;
-import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.Accounts;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
-import org.whispersystems.textsecuregcm.storage.AccountsManager.DeletionReason;
 import org.whispersystems.textsecuregcm.storage.DeletedAccounts;
 import org.whispersystems.textsecuregcm.storage.DeletedAccountsManager;
 import org.whispersystems.textsecuregcm.storage.DynamicConfigurationManager;
@@ -51,13 +53,6 @@ import org.whispersystems.textsecuregcm.storage.VerificationCodeStore;
 import org.whispersystems.textsecuregcm.util.DynamoDbFromConfig;
 import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
 import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import java.time.Clock;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import static com.codahale.metrics.MetricRegistry.name;
 
 public class AssignUsernameCommand extends EnvironmentCommand<WhisperServerConfiguration> {
 
@@ -95,23 +90,6 @@ public class AssignUsernameCommand extends EnvironmentCommand<WhisperServerConfi
 
     ClientResources redisClusterClientResources = ClientResources.builder().build();
 
-    DynamoDbClient reportMessagesDynamoDb = DynamoDbFromConfig.client(
-        configuration.getReportMessageDynamoDbConfiguration(),
-        software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-    DynamoDbClient messageDynamoDb = DynamoDbFromConfig.client(configuration.getMessageDynamoDbConfiguration(),
-        software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-    DynamoDbClient preKeysDynamoDb = DynamoDbFromConfig.client(configuration.getKeysDynamoDbConfiguration(),
-        software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-    DynamoDbClient accountsDynamoDbClient = DynamoDbFromConfig.client(
-        configuration.getAccountsDynamoDbConfiguration(),
-        software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-    DynamoDbClient deletedAccountsDynamoDbClient = DynamoDbFromConfig.client(
-        configuration.getDeletedAccountsDynamoDbConfiguration(),
-        software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-    DynamoDbClient phoneNumberIdentifiersDynamoDbClient =
-        DynamoDbFromConfig.client(configuration.getPhoneNumberIdentifiersDynamoDbConfiguration(),
-            software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-
     FaultTolerantRedisCluster cacheCluster = new FaultTolerantRedisCluster("main_cache_cluster",
         configuration.getCacheClusterConfiguration(), redisClusterClientResources);
 
@@ -132,14 +110,6 @@ public class AssignUsernameCommand extends EnvironmentCommand<WhisperServerConfi
         configuration.getAppConfig().getConfigurationName(), DynamicConfiguration.class);
     dynamicConfigurationManager.start();
 
-    DynamoDbClient pendingAccountsDynamoDbClient = DynamoDbFromConfig.client(
-        configuration.getPendingAccountsDynamoDbConfiguration(),
-        software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-
-    DynamoDbClient reservedUsernamesDynamoDbClient =
-        DynamoDbFromConfig.client(configuration.getReservedUsernamesDynamoDbConfiguration(),
-            software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-
     DynamoDbAsyncClient dynamoDbAsyncClient = DynamoDbFromConfig.asyncClient(
         configuration.getDynamoDbClientConfiguration(),
         software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
@@ -149,39 +119,39 @@ public class AssignUsernameCommand extends EnvironmentCommand<WhisperServerConfi
         software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
 
     AmazonDynamoDB deletedAccountsLockDynamoDbClient = AmazonDynamoDBClientBuilder.standard()
-        .withRegion(configuration.getDeletedAccountsLockDynamoDbConfiguration().getRegion())
+        .withRegion(configuration.getDynamoDbClientConfiguration().getRegion())
         .withClientConfiguration(new ClientConfiguration().withClientExecutionTimeout(
-                ((int) configuration.getDeletedAccountsLockDynamoDbConfiguration().getClientExecutionTimeout()
+                ((int) configuration.getDynamoDbClientConfiguration().getClientExecutionTimeout()
                     .toMillis()))
             .withRequestTimeout(
-                (int) configuration.getDeletedAccountsLockDynamoDbConfiguration().getClientRequestTimeout()
+                (int) configuration.getDynamoDbClientConfiguration().getClientRequestTimeout()
                     .toMillis()))
         .withCredentials(InstanceProfileCredentialsProvider.getInstance())
         .build();
 
-    DeletedAccounts deletedAccounts = new DeletedAccounts(deletedAccountsDynamoDbClient,
-        configuration.getDeletedAccountsDynamoDbConfiguration().getTableName(),
-        configuration.getDeletedAccountsDynamoDbConfiguration().getNeedsReconciliationIndexName());
-    VerificationCodeStore pendingAccounts = new VerificationCodeStore(pendingAccountsDynamoDbClient,
-        configuration.getPendingAccountsDynamoDbConfiguration().getTableName());
+    DeletedAccounts deletedAccounts = new DeletedAccounts(dynamoDbClient,
+        configuration.getDynamoDbTables().getDeletedAccounts().getTableName(),
+        configuration.getDynamoDbTables().getDeletedAccounts().getNeedsReconciliationIndexName());
+    VerificationCodeStore pendingAccounts = new VerificationCodeStore(dynamoDbClient,
+        configuration.getDynamoDbTables().getPendingAccounts().getTableName());
 
-    Accounts accounts = new Accounts(accountsDynamoDbClient,
-        configuration.getAccountsDynamoDbConfiguration().getTableName(),
-        configuration.getAccountsDynamoDbConfiguration().getPhoneNumberTableName(),
-        configuration.getAccountsDynamoDbConfiguration().getPhoneNumberIdentifierTableName(),
-        configuration.getAccountsDynamoDbConfiguration().getUsernamesTableName(),
-        configuration.getAccountsDynamoDbConfiguration().getScanPageSize());
-    PhoneNumberIdentifiers phoneNumberIdentifiers = new PhoneNumberIdentifiers(phoneNumberIdentifiersDynamoDbClient,
-        configuration.getPhoneNumberIdentifiersDynamoDbConfiguration().getTableName());
+    Accounts accounts = new Accounts(dynamoDbClient,
+        configuration.getDynamoDbTables().getAccounts().getTableName(),
+        configuration.getDynamoDbTables().getAccounts().getPhoneNumberTableName(),
+        configuration.getDynamoDbTables().getAccounts().getPhoneNumberIdentifierTableName(),
+        configuration.getDynamoDbTables().getAccounts().getUsernamesTableName(),
+        configuration.getDynamoDbTables().getAccounts().getScanPageSize());
+    PhoneNumberIdentifiers phoneNumberIdentifiers = new PhoneNumberIdentifiers(dynamoDbClient,
+        configuration.getDynamoDbTables().getPhoneNumberIdentifiers().getTableName());
     Profiles profiles = new Profiles(dynamoDbClient, dynamoDbAsyncClient,
         configuration.getDynamoDbTables().getProfiles().getTableName());
-    ReservedUsernames reservedUsernames = new ReservedUsernames(reservedUsernamesDynamoDbClient,
-        configuration.getReservedUsernamesDynamoDbConfiguration().getTableName());
-    Keys keys = new Keys(preKeysDynamoDb,
-        configuration.getKeysDynamoDbConfiguration().getTableName());
-    MessagesDynamoDb messagesDynamoDb = new MessagesDynamoDb(messageDynamoDb,
-        configuration.getMessageDynamoDbConfiguration().getTableName(),
-        configuration.getMessageDynamoDbConfiguration().getTimeToLive());
+    ReservedUsernames reservedUsernames = new ReservedUsernames(dynamoDbClient,
+        configuration.getDynamoDbTables().getReservedUsernames().getTableName());
+    Keys keys = new Keys(dynamoDbClient,
+        configuration.getDynamoDbTables().getKeys().getTableName());
+    MessagesDynamoDb messagesDynamoDb = new MessagesDynamoDb(dynamoDbClient,
+        configuration.getDynamoDbTables().getMessages().getTableName(),
+        configuration.getDynamoDbTables().getMessages().getExpiration());
     FaultTolerantRedisCluster messageInsertCacheCluster = new FaultTolerantRedisCluster("message_insert_cluster",
         configuration.getMessageCacheConfiguration().getRedisClusterConfiguration(), redisClusterClientResources);
     FaultTolerantRedisCluster messageReadDeleteCluster = new FaultTolerantRedisCluster("message_read_delete_cluster",
@@ -204,8 +174,8 @@ public class AssignUsernameCommand extends EnvironmentCommand<WhisperServerConfi
     DirectoryQueue directoryQueue = new DirectoryQueue(
         configuration.getDirectoryConfiguration().getSqsConfiguration());
     ProfilesManager profilesManager = new ProfilesManager(profiles, cacheCluster);
-    ReportMessageDynamoDb reportMessageDynamoDb = new ReportMessageDynamoDb(reportMessagesDynamoDb,
-        configuration.getReportMessageDynamoDbConfiguration().getTableName(),
+    ReportMessageDynamoDb reportMessageDynamoDb = new ReportMessageDynamoDb(dynamoDbClient,
+        configuration.getDynamoDbTables().getReportMessage().getTableName(),
         configuration.getReportMessageConfiguration().getReportTtl());
     ReportMessageManager reportMessageManager = new ReportMessageManager(reportMessageDynamoDb, rateLimitersCluster,
         Metrics.globalRegistry, configuration.getReportMessageConfiguration().getCounterTtl());
@@ -213,7 +183,7 @@ public class AssignUsernameCommand extends EnvironmentCommand<WhisperServerConfi
         reportMessageManager);
     DeletedAccountsManager deletedAccountsManager = new DeletedAccountsManager(deletedAccounts,
         deletedAccountsLockDynamoDbClient,
-        configuration.getDeletedAccountsLockDynamoDbConfiguration().getTableName());
+        configuration.getDynamoDbTables().getDeletedAccountsLock().getTableName());
     StoredVerificationCodeManager pendingAccountsManager = new StoredVerificationCodeManager(pendingAccounts);
     AccountsManager accountsManager = new AccountsManager(accounts, phoneNumberIdentifiers, cacheCluster,
         deletedAccountsManager, directoryQueue, keys, messagesManager, reservedUsernames, profilesManager,
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/workers/DeleteUserCommand.java b/service/src/main/java/org/whispersystems/textsecuregcm/workers/DeleteUserCommand.java
index 6964b5bc8..f9e28aa55 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/workers/DeleteUserCommand.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/workers/DeleteUserCommand.java
@@ -91,24 +91,7 @@ public class DeleteUserCommand extends EnvironmentCommand<WhisperServerConfigura
 
       environment.getObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
-      ClientResources       redisClusterClientResources = ClientResources.builder().build();
-
-      DynamoDbClient reportMessagesDynamoDb = DynamoDbFromConfig.client(
-          configuration.getReportMessageDynamoDbConfiguration(),
-          software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-      DynamoDbClient messageDynamoDb = DynamoDbFromConfig.client(configuration.getMessageDynamoDbConfiguration(),
-          software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-      DynamoDbClient preKeysDynamoDb = DynamoDbFromConfig.client(configuration.getKeysDynamoDbConfiguration(),
-          software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-      DynamoDbClient accountsDynamoDbClient = DynamoDbFromConfig.client(
-          configuration.getAccountsDynamoDbConfiguration(),
-          software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-      DynamoDbClient deletedAccountsDynamoDbClient = DynamoDbFromConfig.client(
-          configuration.getDeletedAccountsDynamoDbConfiguration(),
-          software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-      DynamoDbClient phoneNumberIdentifiersDynamoDbClient =
-          DynamoDbFromConfig.client(configuration.getPhoneNumberIdentifiersDynamoDbConfiguration(),
-              software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
+      ClientResources redisClusterClientResources = ClientResources.builder().build();
 
       FaultTolerantRedisCluster cacheCluster = new FaultTolerantRedisCluster("main_cache_cluster",
           configuration.getCacheClusterConfiguration(), redisClusterClientResources);
@@ -130,13 +113,6 @@ public class DeleteUserCommand extends EnvironmentCommand<WhisperServerConfigura
           configuration.getAppConfig().getConfigurationName(), DynamicConfiguration.class);
       dynamicConfigurationManager.start();
 
-      DynamoDbClient pendingAccountsDynamoDbClient = DynamoDbFromConfig.client(configuration.getPendingAccountsDynamoDbConfiguration(),
-          software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-
-      DynamoDbClient reservedUsernamesDynamoDbClient =
-          DynamoDbFromConfig.client(configuration.getReservedUsernamesDynamoDbConfiguration(),
-              software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-
       DynamoDbAsyncClient dynamoDbAsyncClient = DynamoDbFromConfig.asyncClient(
           configuration.getDynamoDbClientConfiguration(),
           software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
@@ -146,39 +122,39 @@ public class DeleteUserCommand extends EnvironmentCommand<WhisperServerConfigura
           software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
 
       AmazonDynamoDB deletedAccountsLockDynamoDbClient = AmazonDynamoDBClientBuilder.standard()
-          .withRegion(configuration.getDeletedAccountsLockDynamoDbConfiguration().getRegion())
+          .withRegion(configuration.getDynamoDbClientConfiguration().getRegion())
           .withClientConfiguration(new ClientConfiguration().withClientExecutionTimeout(
-                  ((int) configuration.getDeletedAccountsLockDynamoDbConfiguration().getClientExecutionTimeout()
+                  ((int) configuration.getDynamoDbClientConfiguration().getClientExecutionTimeout()
                       .toMillis()))
               .withRequestTimeout(
-                  (int) configuration.getDeletedAccountsLockDynamoDbConfiguration().getClientRequestTimeout()
+                  (int) configuration.getDynamoDbClientConfiguration().getClientRequestTimeout()
                       .toMillis()))
           .withCredentials(InstanceProfileCredentialsProvider.getInstance())
           .build();
 
-      DeletedAccounts deletedAccounts = new DeletedAccounts(deletedAccountsDynamoDbClient,
-          configuration.getDeletedAccountsDynamoDbConfiguration().getTableName(),
-          configuration.getDeletedAccountsDynamoDbConfiguration().getNeedsReconciliationIndexName());
-      VerificationCodeStore pendingAccounts = new VerificationCodeStore(pendingAccountsDynamoDbClient,
-          configuration.getPendingAccountsDynamoDbConfiguration().getTableName());
+      DeletedAccounts deletedAccounts = new DeletedAccounts(dynamoDbClient,
+          configuration.getDynamoDbTables().getDeletedAccounts().getTableName(),
+          configuration.getDynamoDbTables().getDeletedAccounts().getNeedsReconciliationIndexName());
+      VerificationCodeStore pendingAccounts = new VerificationCodeStore(dynamoDbClient,
+          configuration.getDynamoDbTables().getPendingAccounts().getTableName());
 
-      Accounts accounts = new Accounts(accountsDynamoDbClient,
-          configuration.getAccountsDynamoDbConfiguration().getTableName(),
-          configuration.getAccountsDynamoDbConfiguration().getPhoneNumberTableName(),
-          configuration.getAccountsDynamoDbConfiguration().getPhoneNumberIdentifierTableName(),
-          configuration.getAccountsDynamoDbConfiguration().getUsernamesTableName(),
-          configuration.getAccountsDynamoDbConfiguration().getScanPageSize());
-      PhoneNumberIdentifiers phoneNumberIdentifiers = new PhoneNumberIdentifiers(phoneNumberIdentifiersDynamoDbClient,
-          configuration.getPhoneNumberIdentifiersDynamoDbConfiguration().getTableName());
+      Accounts accounts = new Accounts(dynamoDbClient,
+          configuration.getDynamoDbTables().getAccounts().getTableName(),
+          configuration.getDynamoDbTables().getAccounts().getPhoneNumberTableName(),
+          configuration.getDynamoDbTables().getAccounts().getPhoneNumberIdentifierTableName(),
+          configuration.getDynamoDbTables().getAccounts().getUsernamesTableName(),
+          configuration.getDynamoDbTables().getAccounts().getScanPageSize());
+      PhoneNumberIdentifiers phoneNumberIdentifiers = new PhoneNumberIdentifiers(dynamoDbClient,
+          configuration.getDynamoDbTables().getPhoneNumberIdentifiers().getTableName());
       Profiles profiles = new Profiles(dynamoDbClient, dynamoDbAsyncClient,
           configuration.getDynamoDbTables().getProfiles().getTableName());
-      ReservedUsernames reservedUsernames = new ReservedUsernames(reservedUsernamesDynamoDbClient,
-          configuration.getReservedUsernamesDynamoDbConfiguration().getTableName());
-      Keys keys = new Keys(preKeysDynamoDb,
-          configuration.getKeysDynamoDbConfiguration().getTableName());
-      MessagesDynamoDb messagesDynamoDb = new MessagesDynamoDb(messageDynamoDb,
-          configuration.getMessageDynamoDbConfiguration().getTableName(),
-          configuration.getMessageDynamoDbConfiguration().getTimeToLive());
+      ReservedUsernames reservedUsernames = new ReservedUsernames(dynamoDbClient,
+          configuration.getDynamoDbTables().getReservedUsernames().getTableName());
+      Keys keys = new Keys(dynamoDbClient,
+          configuration.getDynamoDbTables().getKeys().getTableName());
+      MessagesDynamoDb messagesDynamoDb = new MessagesDynamoDb(dynamoDbClient,
+          configuration.getDynamoDbTables().getMessages().getTableName(),
+          configuration.getDynamoDbTables().getMessages().getExpiration());
       FaultTolerantRedisCluster messageInsertCacheCluster = new FaultTolerantRedisCluster("message_insert_cluster",
           configuration.getMessageCacheConfiguration().getRedisClusterConfiguration(), redisClusterClientResources);
       FaultTolerantRedisCluster messageReadDeleteCluster = new FaultTolerantRedisCluster("message_read_delete_cluster",
@@ -201,8 +177,8 @@ public class DeleteUserCommand extends EnvironmentCommand<WhisperServerConfigura
       DirectoryQueue directoryQueue = new DirectoryQueue(
           configuration.getDirectoryConfiguration().getSqsConfiguration());
       ProfilesManager profilesManager = new ProfilesManager(profiles, cacheCluster);
-      ReportMessageDynamoDb reportMessageDynamoDb = new ReportMessageDynamoDb(reportMessagesDynamoDb,
-          configuration.getReportMessageDynamoDbConfiguration().getTableName(),
+      ReportMessageDynamoDb reportMessageDynamoDb = new ReportMessageDynamoDb(dynamoDbClient,
+          configuration.getDynamoDbTables().getReportMessage().getTableName(),
           configuration.getReportMessageConfiguration().getReportTtl());
       ReportMessageManager reportMessageManager = new ReportMessageManager(reportMessageDynamoDb, rateLimitersCluster,
           Metrics.globalRegistry, configuration.getReportMessageConfiguration().getCounterTtl());
@@ -210,7 +186,7 @@ public class DeleteUserCommand extends EnvironmentCommand<WhisperServerConfigura
           reportMessageManager);
       DeletedAccountsManager deletedAccountsManager = new DeletedAccountsManager(deletedAccounts,
           deletedAccountsLockDynamoDbClient,
-          configuration.getDeletedAccountsLockDynamoDbConfiguration().getTableName());
+          configuration.getDynamoDbTables().getDeletedAccountsLock().getTableName());
       StoredVerificationCodeManager pendingAccountsManager = new StoredVerificationCodeManager(pendingAccounts);
       AccountsManager accountsManager = new AccountsManager(accounts, phoneNumberIdentifiers, cacheCluster,
           deletedAccountsManager, directoryQueue, keys, messagesManager, reservedUsernames, profilesManager,
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/workers/ReserveUsernameCommand.java b/service/src/main/java/org/whispersystems/textsecuregcm/workers/ReserveUsernameCommand.java
index e700a3956..6ded0de40 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/workers/ReserveUsernameCommand.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/workers/ReserveUsernameCommand.java
@@ -41,11 +41,11 @@ public class ReserveUsernameCommand extends ConfiguredCommand<WhisperServerConfi
   protected void run(final Bootstrap<WhisperServerConfiguration> bootstrap, final Namespace namespace,
       final WhisperServerConfiguration config) throws Exception {
 
-    final DynamoDbClient reservedUsernamesDynamoDbClient = DynamoDbFromConfig.client(config.getReservedUsernamesDynamoDbConfiguration(),
+    final DynamoDbClient dynamoDbClient = DynamoDbFromConfig.client(config.getDynamoDbClientConfiguration(),
         software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
 
-    final ReservedUsernames reservedUsernames = new ReservedUsernames(reservedUsernamesDynamoDbClient,
-        config.getReservedUsernamesDynamoDbConfiguration().getTableName());
+    final ReservedUsernames reservedUsernames = new ReservedUsernames(dynamoDbClient,
+        config.getDynamoDbTables().getReservedUsernames().getTableName());
 
     final String pattern = namespace.getString("pattern").trim();
 
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/workers/SetUserDiscoverabilityCommand.java b/service/src/main/java/org/whispersystems/textsecuregcm/workers/SetUserDiscoverabilityCommand.java
index ecc40ec1b..bebd7ec33 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/workers/SetUserDiscoverabilityCommand.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/workers/SetUserDiscoverabilityCommand.java
@@ -94,26 +94,6 @@ public class SetUserDiscoverabilityCommand extends EnvironmentCommand<WhisperSer
 
       ClientResources redisClusterClientResources = ClientResources.builder().build();
 
-      DynamoDbClient reportMessagesDynamoDb = DynamoDbFromConfig
-          .client(configuration.getReportMessageDynamoDbConfiguration(),
-              software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-      DynamoDbClient messageDynamoDb = DynamoDbFromConfig.client(configuration.getMessageDynamoDbConfiguration(),
-          software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-      DynamoDbClient preKeysDynamoDb = DynamoDbFromConfig.client(configuration.getKeysDynamoDbConfiguration(),
-          software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-      DynamoDbClient accountsDynamoDbClient = DynamoDbFromConfig
-          .client(configuration.getAccountsDynamoDbConfiguration(),
-              software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-      DynamoDbClient deletedAccountsDynamoDbClient = DynamoDbFromConfig
-          .client(configuration.getDeletedAccountsDynamoDbConfiguration(),
-              software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-      DynamoDbClient phoneNumberIdentifiersDynamoDbClient =
-          DynamoDbFromConfig.client(configuration.getPhoneNumberIdentifiersDynamoDbConfiguration(),
-              software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-      DynamoDbClient reservedUsernamesDynamoDbClient =
-          DynamoDbFromConfig.client(configuration.getReservedUsernamesDynamoDbConfiguration(),
-              software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-
       FaultTolerantRedisCluster cacheCluster = new FaultTolerantRedisCluster("main_cache_cluster",
           configuration.getCacheClusterConfiguration(), redisClusterClientResources);
       FaultTolerantRedisCluster rateLimitersCluster = new FaultTolerantRedisCluster("rate_limiters",
@@ -136,10 +116,6 @@ public class SetUserDiscoverabilityCommand extends EnvironmentCommand<WhisperSer
           configuration.getAppConfig().getConfigurationName(), DynamicConfiguration.class);
       dynamicConfigurationManager.start();
 
-      DynamoDbClient pendingAccountsDynamoDbClient = DynamoDbFromConfig
-          .client(configuration.getPendingAccountsDynamoDbConfiguration(),
-              software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
-
       DynamoDbAsyncClient dynamoDbAsyncClient = DynamoDbFromConfig.asyncClient(
           configuration.getDynamoDbClientConfiguration(),
           software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
@@ -149,39 +125,39 @@ public class SetUserDiscoverabilityCommand extends EnvironmentCommand<WhisperSer
           software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider.create());
 
       AmazonDynamoDB deletedAccountsLockDynamoDbClient = AmazonDynamoDBClientBuilder.standard()
-          .withRegion(configuration.getDeletedAccountsLockDynamoDbConfiguration().getRegion())
+          .withRegion(configuration.getDynamoDbClientConfiguration().getRegion())
           .withClientConfiguration(new ClientConfiguration().withClientExecutionTimeout(
-              ((int) configuration.getDeletedAccountsLockDynamoDbConfiguration().getClientExecutionTimeout()
+              ((int) configuration.getDynamoDbClientConfiguration().getClientExecutionTimeout()
                   .toMillis()))
               .withRequestTimeout(
-                  (int) configuration.getDeletedAccountsLockDynamoDbConfiguration().getClientRequestTimeout()
+                  (int) configuration.getDynamoDbClientConfiguration().getClientRequestTimeout()
                       .toMillis()))
           .withCredentials(InstanceProfileCredentialsProvider.getInstance())
           .build();
 
-      DeletedAccounts deletedAccounts = new DeletedAccounts(deletedAccountsDynamoDbClient,
-          configuration.getDeletedAccountsDynamoDbConfiguration().getTableName(),
-          configuration.getDeletedAccountsDynamoDbConfiguration().getNeedsReconciliationIndexName());
-      VerificationCodeStore pendingAccounts = new VerificationCodeStore(pendingAccountsDynamoDbClient,
-          configuration.getPendingAccountsDynamoDbConfiguration().getTableName());
+      DeletedAccounts deletedAccounts = new DeletedAccounts(dynamoDbClient,
+          configuration.getDynamoDbTables().getDeletedAccounts().getTableName(),
+          configuration.getDynamoDbTables().getDeletedAccounts().getNeedsReconciliationIndexName());
+      VerificationCodeStore pendingAccounts = new VerificationCodeStore(dynamoDbClient,
+          configuration.getDynamoDbTables().getPendingAccounts().getTableName());
 
-      Accounts accounts = new Accounts(accountsDynamoDbClient,
-          configuration.getAccountsDynamoDbConfiguration().getTableName(),
-          configuration.getAccountsDynamoDbConfiguration().getPhoneNumberTableName(),
-          configuration.getAccountsDynamoDbConfiguration().getPhoneNumberIdentifierTableName(),
-          configuration.getAccountsDynamoDbConfiguration().getUsernamesTableName(),
-          configuration.getAccountsDynamoDbConfiguration().getScanPageSize());
-      PhoneNumberIdentifiers phoneNumberIdentifiers = new PhoneNumberIdentifiers(phoneNumberIdentifiersDynamoDbClient,
-          configuration.getPhoneNumberIdentifiersDynamoDbConfiguration().getTableName());
+      Accounts accounts = new Accounts(dynamoDbClient,
+          configuration.getDynamoDbTables().getAccounts().getTableName(),
+          configuration.getDynamoDbTables().getAccounts().getPhoneNumberTableName(),
+          configuration.getDynamoDbTables().getAccounts().getPhoneNumberIdentifierTableName(),
+          configuration.getDynamoDbTables().getAccounts().getUsernamesTableName(),
+          configuration.getDynamoDbTables().getAccounts().getScanPageSize());
+      PhoneNumberIdentifiers phoneNumberIdentifiers = new PhoneNumberIdentifiers(dynamoDbClient,
+          configuration.getDynamoDbTables().getPhoneNumberIdentifiers().getTableName());
       Profiles profiles = new Profiles(dynamoDbClient, dynamoDbAsyncClient,
           configuration.getDynamoDbTables().getProfiles().getTableName());
-      ReservedUsernames reservedUsernames = new ReservedUsernames(reservedUsernamesDynamoDbClient,
-          configuration.getReservedUsernamesDynamoDbConfiguration().getTableName());
-      Keys keys = new Keys(preKeysDynamoDb,
-          configuration.getKeysDynamoDbConfiguration().getTableName());
-      MessagesDynamoDb messagesDynamoDb = new MessagesDynamoDb(messageDynamoDb,
-          configuration.getMessageDynamoDbConfiguration().getTableName(),
-          configuration.getMessageDynamoDbConfiguration().getTimeToLive());
+      ReservedUsernames reservedUsernames = new ReservedUsernames(dynamoDbClient,
+          configuration.getDynamoDbTables().getReservedUsernames().getTableName());
+      Keys keys = new Keys(dynamoDbClient,
+          configuration.getDynamoDbTables().getKeys().getTableName());
+      MessagesDynamoDb messagesDynamoDb = new MessagesDynamoDb(dynamoDbClient,
+          configuration.getDynamoDbTables().getMessages().getTableName(),
+          configuration.getDynamoDbTables().getMessages().getExpiration());
       FaultTolerantRedisCluster messageInsertCacheCluster = new FaultTolerantRedisCluster("message_insert_cluster",
           configuration.getMessageCacheConfiguration().getRedisClusterConfiguration(), redisClusterClientResources);
       FaultTolerantRedisCluster messageReadDeleteCluster = new FaultTolerantRedisCluster("message_read_delete_cluster",
@@ -202,8 +178,8 @@ public class SetUserDiscoverabilityCommand extends EnvironmentCommand<WhisperSer
       DirectoryQueue directoryQueue = new DirectoryQueue(
           configuration.getDirectoryConfiguration().getSqsConfiguration());
       ProfilesManager profilesManager = new ProfilesManager(profiles, cacheCluster);
-      ReportMessageDynamoDb reportMessageDynamoDb = new ReportMessageDynamoDb(reportMessagesDynamoDb,
-          configuration.getReportMessageDynamoDbConfiguration().getTableName(),
+      ReportMessageDynamoDb reportMessageDynamoDb = new ReportMessageDynamoDb(dynamoDbClient,
+          configuration.getDynamoDbTables().getReportMessage().getTableName(),
           configuration.getReportMessageConfiguration().getReportTtl());
       ReportMessageManager reportMessageManager = new ReportMessageManager(reportMessageDynamoDb, rateLimitersCluster,
           Metrics.globalRegistry, configuration.getReportMessageConfiguration().getCounterTtl());
@@ -211,7 +187,7 @@ public class SetUserDiscoverabilityCommand extends EnvironmentCommand<WhisperSer
           reportMessageManager);
       DeletedAccountsManager deletedAccountsManager = new DeletedAccountsManager(deletedAccounts,
           deletedAccountsLockDynamoDbClient,
-          configuration.getDeletedAccountsLockDynamoDbConfiguration().getTableName());
+          configuration.getDynamoDbTables().getDeletedAccountsLock().getTableName());
       StoredVerificationCodeManager pendingAccountsManager = new StoredVerificationCodeManager(pendingAccounts);
       AccountsManager accountsManager = new AccountsManager(accounts, phoneNumberIdentifiers, cacheCluster,
           deletedAccountsManager, directoryQueue, keys, messagesManager, reservedUsernames, profilesManager,