diff --git a/data-node/pom.xml b/data-node/pom.xml
index 5d0984facb..5227925ff5 100644
--- a/data-node/pom.xml
+++ b/data-node/pom.xml
@@ -582,7 +582,7 @@
                             <url>https://artifacts.opensearch.org/releases/plugins/repository-s3/${opensearch.version}/repository-s3-${opensearch.version}.zip</url>
                             <outputFileName>repository-s3-${opensearch.version}.zip</outputFileName>
                             <outputDirectory>${project.build.directory}/opensearch/plugins</outputDirectory>
-                            <md5>c361d92a4ae83328dfd413878b8747e6</md5>
+                            <sha512>54d471004aeb792c9103350fb70c0cfa721958205f67b008f35a01e2fad7e15be47b02470b99aea903cd22e2fb773ed466628950d94af83f9a50faaf984503bd</sha512>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/data-node/src/main/java/org/graylog/datanode/management/opensearch/cli/OpensearchKeystoreCli.java b/data-node/src/main/java/org/graylog/datanode/management/opensearch/cli/OpensearchKeystoreCli.java
index 3a1d4e23c8..79d3483698 100644
--- a/data-node/src/main/java/org/graylog/datanode/management/opensearch/cli/OpensearchKeystoreCli.java
+++ b/data-node/src/main/java/org/graylog/datanode/management/opensearch/cli/OpensearchKeystoreCli.java
@@ -27,12 +27,12 @@ public class OpensearchKeystoreCli extends AbstractOpensearchCli {
     }
 
     /**
-     * Create a new opensearch keystore. This command expects that there is no keystore. Otherwise, it will ask for
-     * confirmation to override it and this fails, as there is currently no stdin configured.
+     * Create a new opensearch keystore. This command expects that there is no keystore. If there is a keystore,
+     * it will respond YES to override existing.
      * @return STDOUT/STDERR of the execution as one String
      */
     public String create() {
-        return runBatch("create");
+        return runWithStdin(Collections.singletonList("Y"),"create");
     }
 
     /**
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/storage/migration/state/actions/MigrationActionsImpl.java b/graylog2-server/src/main/java/org/graylog/plugins/views/storage/migration/state/actions/MigrationActionsImpl.java
index 4ae1718499..837d18c060 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/storage/migration/state/actions/MigrationActionsImpl.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/storage/migration/state/actions/MigrationActionsImpl.java
@@ -43,6 +43,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 
 @Singleton
 public class MigrationActionsImpl implements MigrationActions {
@@ -204,7 +205,8 @@ public class MigrationActionsImpl implements MigrationActions {
 
     @Override
     public boolean isRemoteReindexingFinished() {
-        return getStateMachineContext().getExtendedState(MigrationStateMachineContext.KEY_MIGRATION_ID, String.class)
+        return Optional.ofNullable(getStateMachineContext())
+                .flatMap(ctx -> ctx.getExtendedState(MigrationStateMachineContext.KEY_MIGRATION_ID, String.class))
                 .map(migrationService::status)
                 .filter(m -> m.status() == RemoteReindexingMigrationAdapter.Status.FINISHED)
                 .isPresent();